equal
deleted
inserted
replaced
5 # |
5 # |
6 # Note: MIT will unlikely want the pam_krb5_migrate kadmind authorization |
6 # Note: MIT will unlikely want the pam_krb5_migrate kadmind authorization |
7 # functionality as this is specific to a 3rd party migration design. |
7 # functionality as this is specific to a 3rd party migration design. |
8 # Patch source: in-house |
8 # Patch source: in-house |
9 # |
9 # |
10 diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in |
|
11 --- a/src/kadmin/server/Makefile.in |
10 --- a/src/kadmin/server/Makefile.in |
12 +++ b/src/kadmin/server/Makefile.in |
11 +++ b/src/kadmin/server/Makefile.in |
13 @@ -13,7 +13,7 @@ SRCS = kadm_rpc_svc.c server_stubs.c ovsec_kadmd.c schpw.c misc.c ipropd_svc.c |
12 @@ -13,7 +13,7 @@ SRCS = kadm_rpc_svc.c server_stubs.c ovsec_kadmd.c schpw.c misc.c ipropd_svc.c |
14 all:: $(PROG) |
13 all:: $(PROG) |
15 |
14 |
17 - $(CC_LINK) -o $(PROG) $(OBJS) $(APPUTILS_LIB) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) $(VERTO_LIBS) |
16 - $(CC_LINK) -o $(PROG) $(OBJS) $(APPUTILS_LIB) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) $(VERTO_LIBS) |
18 + $(CC_LINK) -o $(PROG) $(OBJS) $(APPUTILS_LIB) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) $(VERTO_LIBS) -lpam |
17 + $(CC_LINK) -o $(PROG) $(OBJS) $(APPUTILS_LIB) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) $(VERTO_LIBS) -lpam |
19 |
18 |
20 install:: |
19 install:: |
21 $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(SERVER_BINDIR)/$(PROG) |
20 $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(SERVER_BINDIR)/$(PROG) |
22 diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c |
|
23 --- a/src/kadmin/server/server_stubs.c |
21 --- a/src/kadmin/server/server_stubs.c |
24 +++ b/src/kadmin/server/server_stubs.c |
22 +++ b/src/kadmin/server/server_stubs.c |
25 @@ -16,6 +16,7 @@ |
23 @@ -16,6 +16,7 @@ |
26 #include <syslog.h> |
24 #include <syslog.h> |
27 #include <adm_proto.h> /* krb5_klog_syslog */ |
25 #include <adm_proto.h> /* krb5_klog_syslog */ |
218 + &client_name, &service_name, rqstp); |
216 + &client_name, &service_name, rqstp); |
219 + } |
217 + } |
220 } |
218 } |
221 free(prime_arg); |
219 free(prime_arg); |
222 |
220 |
223 diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c |
|
224 --- a/src/lib/kadm5/srv/server_acl.c |
221 --- a/src/lib/kadm5/srv/server_acl.c |
225 +++ b/src/lib/kadm5/srv/server_acl.c |
222 +++ b/src/lib/kadm5/srv/server_acl.c |
226 @@ -24,6 +24,10 @@ |
223 @@ -24,6 +24,10 @@ |
227 * or implied warranty. |
224 * or implied warranty. |
228 */ |
225 */ |
240 { 's', ACL_SETKEY }, |
237 { 's', ACL_SETKEY }, |
241 + { 'u', ACL_MIGRATE }, |
238 + { 'u', ACL_MIGRATE }, |
242 { 'x', ACL_ALL_MASK }, |
239 { 'x', ACL_ALL_MASK }, |
243 { '*', ACL_ALL_MASK }, |
240 { '*', ACL_ALL_MASK }, |
244 { '\0', 0 } |
241 { '\0', 0 } |
245 diff --git a/src/lib/kadm5/srv/server_acl.h b/src/lib/kadm5/srv/server_acl.h |
|
246 --- a/src/lib/kadm5/srv/server_acl.h |
242 --- a/src/lib/kadm5/srv/server_acl.h |
247 +++ b/src/lib/kadm5/srv/server_acl.h |
243 +++ b/src/lib/kadm5/srv/server_acl.h |
248 @@ -24,6 +24,10 @@ |
244 @@ -24,6 +24,10 @@ |
249 * or implied warranty. |
245 * or implied warranty. |
250 */ |
246 */ |