Deleted Added
sdiff udiff text old ( 120945 ) new ( 178825 )
full compact
mod.c (120945) mod.c (178825)
1/*
1/*
2 * Copyright (c) 1997 - 2000 Kungliga Tekniska H�gskolan
2 * Copyright (c) 1997 - 2006 Kungliga Tekniska H�gskolan
3 * (Royal Institute of Technology, Stockholm, Sweden).
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 *
10 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#include "kadmin_locl.h"
3 * (Royal Institute of Technology, Stockholm, Sweden).
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 *
10 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#include "kadmin_locl.h"
35#include "kadmin-commands.h"
35
36
36RCSID("$Id: mod.c,v 1.11 2002/12/03 14:12:30 joda Exp $");
37RCSID("$Id: mod.c 21968 2007-10-18 18:50:33Z lha $");
37
38
38static int parse_args (krb5_context context, kadm5_principal_ent_t ent,
39 int argc, char **argv, int *optind, char *name,
40 int *mask);
41
42static int
43parse_args(krb5_context context, kadm5_principal_ent_t ent,
44 int argc, char **argv, int *optind, char *name,
45 int *mask)
39static void
40add_tl(kadm5_principal_ent_rec *princ, int type, krb5_data *data)
46{
41{
47 char *attr_str = NULL;
48 char *max_life_str = NULL;
49 char *max_rlife_str = NULL;
50 char *expiration_str = NULL;
51 char *pw_expiration_str = NULL;
52 int new_kvno = -1;
53 int ret, i;
42 krb5_tl_data *tl, **ptl;
54
43
55 struct getargs args[] = {
56 {"attributes", 'a', arg_string, NULL, "Attributies",
57 "attributes"},
58 {"max-ticket-life", 0, arg_string, NULL, "max ticket lifetime",
59 "lifetime"},
60 {"max-renewable-life", 0, arg_string, NULL,
61 "max renewable lifetime", "lifetime" },
62 {"expiration-time", 0, arg_string,
63 NULL, "Expiration time", "time"},
64 {"pw-expiration-time", 0, arg_string,
65 NULL, "Password expiration time", "time"},
66 {"kvno", 0, arg_integer,
67 NULL, "Key version number", "number"},
68 };
44 tl = ecalloc(1, sizeof(*tl));
45 tl->tl_data_next = NULL;
46 tl->tl_data_type = KRB5_TL_EXTENSION;
47 tl->tl_data_length = data->length;
48 tl->tl_data_contents = data->data;
49
50 princ->n_tl_data++;
51 ptl = &princ->tl_data;
52 while (*ptl != NULL)
53 ptl = &(*ptl)->tl_data_next;
54 *ptl = tl;
69
55
70 i = 0;
71 args[i++].value = &attr_str;
72 args[i++].value = &max_life_str;
73 args[i++].value = &max_rlife_str;
74 args[i++].value = &expiration_str;
75 args[i++].value = &pw_expiration_str;
76 args[i++].value = &new_kvno;
56 return;
57}
77
58
78 *optind = 0; /* XXX */
59static void
60add_constrained_delegation(krb5_context context,
61 kadm5_principal_ent_rec *princ,
62 struct getarg_strings *strings)
63{
64 krb5_error_code ret;
65 HDB_extension ext;
66 krb5_data buf;
67 size_t size;
68
69 memset(&ext, 0, sizeof(ext));
70 ext.mandatory = FALSE;
71 ext.data.element = choice_HDB_extension_data_allowed_to_delegate_to;
79
72
80 if(getarg(args, sizeof(args) / sizeof(args[0]),
81 argc, argv, optind)){
82 arg_printusage(args,
83 sizeof(args) / sizeof(args[0]),
84 name ? name : "",
85 "principal");
86 return -1;
73 if (strings->num_strings == 1 && strings->strings[0][0] == '\0') {
74 ext.data.u.allowed_to_delegate_to.val = NULL;
75 ext.data.u.allowed_to_delegate_to.len = 0;
76 } else {
77 krb5_principal p;
78 int i;
79
80 ext.data.u.allowed_to_delegate_to.val =
81 calloc(strings->num_strings,
82 sizeof(ext.data.u.allowed_to_delegate_to.val[0]));
83 ext.data.u.allowed_to_delegate_to.len = strings->num_strings;
84
85 for (i = 0; i < strings->num_strings; i++) {
86 ret = krb5_parse_name(context, strings->strings[i], &p);
87 ret = copy_Principal(p, &ext.data.u.allowed_to_delegate_to.val[i]);
88 krb5_free_principal(context, p);
89 }
87 }
90 }
88
89 ret = set_entry(context, ent, mask, max_life_str, max_rlife_str,
90 expiration_str, pw_expiration_str, attr_str);
91
92 ASN1_MALLOC_ENCODE(HDB_extension, buf.data, buf.length,
93 &ext, &size, ret);
94 free_HDB_extension(&ext);
91 if (ret)
95 if (ret)
92 return ret;
96 abort();
97 if (buf.length != size)
98 abort();
93
99
94 if(new_kvno != -1) {
95 ent->kvno = new_kvno;
96 *mask |= KADM5_KVNO;
97 }
98 return 0;
100 add_tl(princ, KRB5_TL_EXTENSION, &buf);
99}
100
101}
102
101int
102mod_entry(int argc, char **argv)
103static void
104add_aliases(krb5_context context, kadm5_principal_ent_rec *princ,
105 struct getarg_strings *strings)
103{
106{
104 kadm5_principal_ent_rec princ;
105 int mask = 0;
106 krb5_error_code ret;
107 krb5_error_code ret;
107 krb5_principal princ_ent = NULL;
108 int optind;
108 HDB_extension ext;
109 krb5_data buf;
110 krb5_principal p;
111 size_t size;
112 int i;
113
114 memset(&ext, 0, sizeof(ext));
115 ext.mandatory = FALSE;
116 ext.data.element = choice_HDB_extension_data_aliases;
117 ext.data.u.aliases.case_insensitive = 0;
109
118
110 memset (&princ, 0, sizeof(princ));
119 if (strings->num_strings == 1 && strings->strings[0][0] == '\0') {
120 ext.data.u.aliases.aliases.val = NULL;
121 ext.data.u.aliases.aliases.len = 0;
122 } else {
123 ext.data.u.aliases.aliases.val =
124 calloc(strings->num_strings,
125 sizeof(ext.data.u.aliases.aliases.val[0]));
126 ext.data.u.aliases.aliases.len = strings->num_strings;
127
128 for (i = 0; i < strings->num_strings; i++) {
129 ret = krb5_parse_name(context, strings->strings[i], &p);
130 ret = copy_Principal(p, &ext.data.u.aliases.aliases.val[i]);
131 krb5_free_principal(context, p);
132 }
133 }
111
134
112 ret = parse_args (context, &princ, argc, argv,
113 &optind, "mod", &mask);
135 ASN1_MALLOC_ENCODE(HDB_extension, buf.data, buf.length,
136 &ext, &size, ret);
137 free_HDB_extension(&ext);
114 if (ret)
138 if (ret)
115 return 0;
139 abort();
140 if (buf.length != size)
141 abort();
142
143 add_tl(princ, KRB5_TL_EXTENSION, &buf);
144}
116
145
117 argc -= optind;
118 argv += optind;
146static void
147add_pkinit_acl(krb5_context context, kadm5_principal_ent_rec *princ,
148 struct getarg_strings *strings)
149{
150 krb5_error_code ret;
151 HDB_extension ext;
152 krb5_data buf;
153 size_t size;
154 int i;
119
155
120 if (argc != 1) {
121 printf ("Usage: mod [options] principal\n");
122 return 0;
156 memset(&ext, 0, sizeof(ext));
157 ext.mandatory = FALSE;
158 ext.data.element = choice_HDB_extension_data_pkinit_acl;
159 ext.data.u.aliases.case_insensitive = 0;
160
161 if (strings->num_strings == 1 && strings->strings[0][0] == '\0') {
162 ext.data.u.pkinit_acl.val = NULL;
163 ext.data.u.pkinit_acl.len = 0;
164 } else {
165 ext.data.u.pkinit_acl.val =
166 calloc(strings->num_strings,
167 sizeof(ext.data.u.pkinit_acl.val[0]));
168 ext.data.u.pkinit_acl.len = strings->num_strings;
169
170 for (i = 0; i < strings->num_strings; i++) {
171 ext.data.u.pkinit_acl.val[i].subject = estrdup(strings->strings[i]);
172 }
123 }
124
173 }
174
125 krb5_parse_name(context, argv[0], &princ_ent);
175 ASN1_MALLOC_ENCODE(HDB_extension, buf.data, buf.length,
176 &ext, &size, ret);
177 free_HDB_extension(&ext);
178 if (ret)
179 abort();
180 if (buf.length != size)
181 abort();
182
183 add_tl(princ, KRB5_TL_EXTENSION, &buf);
184}
126
185
127 if (mask == 0) {
128 memset(&princ, 0, sizeof(princ));
129 ret = kadm5_get_principal(kadm_handle, princ_ent, &princ,
130 KADM5_PRINCIPAL | KADM5_ATTRIBUTES |
131 KADM5_MAX_LIFE | KADM5_MAX_RLIFE |
132 KADM5_PRINC_EXPIRE_TIME |
133 KADM5_PW_EXPIRATION);
134 krb5_free_principal (context, princ_ent);
135 if (ret) {
136 printf ("no such principal: %s\n", argv[0]);
137 return 0;
186static int
187do_mod_entry(krb5_principal principal, void *data)
188{
189 krb5_error_code ret;
190 kadm5_principal_ent_rec princ;
191 int mask = 0;
192 struct modify_options *e = data;
193
194 memset (&princ, 0, sizeof(princ));
195 ret = kadm5_get_principal(kadm_handle, principal, &princ,
196 KADM5_PRINCIPAL | KADM5_ATTRIBUTES |
197 KADM5_MAX_LIFE | KADM5_MAX_RLIFE |
198 KADM5_PRINC_EXPIRE_TIME |
199 KADM5_PW_EXPIRATION);
200 if(ret)
201 return ret;
202
203 if(e->max_ticket_life_string ||
204 e->max_renewable_life_string ||
205 e->expiration_time_string ||
206 e->pw_expiration_time_string ||
207 e->attributes_string ||
208 e->kvno_integer != -1 ||
209 e->constrained_delegation_strings.num_strings ||
210 e->alias_strings.num_strings ||
211 e->pkinit_acl_strings.num_strings) {
212 ret = set_entry(context, &princ, &mask,
213 e->max_ticket_life_string,
214 e->max_renewable_life_string,
215 e->expiration_time_string,
216 e->pw_expiration_time_string,
217 e->attributes_string);
218 if(e->kvno_integer != -1) {
219 princ.kvno = e->kvno_integer;
220 mask |= KADM5_KVNO;
138 }
221 }
139 if(edit_entry(&princ, &mask, NULL, 0))
140 goto out;
141 } else {
142 princ.principal = princ_ent;
143 }
222 if (e->constrained_delegation_strings.num_strings) {
223 add_constrained_delegation(context, &princ,
224 &e->constrained_delegation_strings);
225 mask |= KADM5_TL_DATA;
226 }
227 if (e->alias_strings.num_strings) {
228 add_aliases(context, &princ, &e->alias_strings);
229 mask |= KADM5_TL_DATA;
230 }
231 if (e->pkinit_acl_strings.num_strings) {
232 add_pkinit_acl(context, &princ, &e->pkinit_acl_strings);
233 mask |= KADM5_TL_DATA;
234 }
144
235
145 ret = kadm5_modify_principal(kadm_handle, &princ, mask);
146 if(ret)
147 krb5_warn(context, ret, "kadm5_modify_principal");
148 out:
236 } else
237 ret = edit_entry(&princ, &mask, NULL, 0);
238 if(ret == 0) {
239 ret = kadm5_modify_principal(kadm_handle, &princ, mask);
240 if(ret)
241 krb5_warn(context, ret, "kadm5_modify_principal");
242 }
243
149 kadm5_free_principal_ent(kadm_handle, &princ);
244 kadm5_free_principal_ent(kadm_handle, &princ);
150 return 0;
245 return ret;
151}
246}
247
248int
249mod_entry(struct modify_options *opt, int argc, char **argv)
250{
251 krb5_error_code ret = 0;
252 int i;
253
254 for(i = 0; i < argc; i++) {
255 ret = foreach_principal(argv[i], do_mod_entry, "mod", opt);
256 if (ret)
257 break;
258 }
259 return ret != 0;
260}
261