summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1998-07-08 05:34:11 +0000
committerTheodore Tso <tytso@mit.edu>1998-07-08 05:34:11 +0000
commitb21107bbc2eda0d16a201c154da50c00e567e41b (patch)
tree63cdfd3d778ab615b263e2782c28ef24ea6c6c8a
parent2d0d7b36528efdf179f9cb725c7913cd8d65a27d (diff)
downloadkrb5-b21107bbc2eda0d16a201c154da50c00e567e41b.tar.gz
krb5-b21107bbc2eda0d16a201c154da50c00e567e41b.tar.xz
krb5-b21107bbc2eda0d16a201c154da50c00e567e41b.zip
kadm_ser_wrap.c (kadm_ser_init): Use krb5_425_conv_principal instead
of krb5_build_principal to create the changepw sprinc principal. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10625 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/kadmin/v4server/ChangeLog6
-rw-r--r--src/kadmin/v4server/kadm_ser_wrap.c9
2 files changed, 9 insertions, 6 deletions
diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index c8846ff141..89b58d43ce 100644
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 8 01:32:52 1998 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * kadm_ser_wrap.c (kadm_ser_init): Use krb5_425_conv_principal
+ instead of krb5_build_principal to create the changepw
+ sprinc principal.
+
Fri Jul 3 18:17:48 1998 Theodore Y. Ts'o <tytso@mit.edu>
* Makefile.in (build_pwfile): Add rule to build the build_pwfile
diff --git a/src/kadmin/v4server/kadm_ser_wrap.c b/src/kadmin/v4server/kadm_ser_wrap.c
index 21ed70707c..2c5c8076c2 100644
--- a/src/kadmin/v4server/kadm_ser_wrap.c
+++ b/src/kadmin/v4server/kadm_ser_wrap.c
@@ -65,12 +65,9 @@ kadm_ser_init(inter, realm)
(void) strcpy(server_parm.sname, PWSERV_NAME);
(void) strcpy(server_parm.sinst, KRB_MASTER);
(void) strcpy(server_parm.krbrlm, realm);
- if (krb5_build_principal(kadm_context,
- &server_parm.sprinc,
- strlen(realm),
- realm,
- PWSERV_NAME,
- KRB_MASTER, 0))
+ if (krb5_425_conv_principal(kadm_context, server_parm.sname,
+ server_parm.sinst, server_parm.krbrlm,
+ &server_parm.sprinc))
return KADM_NO_MAST;
server_parm.admin_fd = -1;
/* setting up the addrs */