summaryrefslogtreecommitdiffstats
path: root/src/kadmin
diff options
context:
space:
mode:
Diffstat (limited to 'src/kadmin')
-rw-r--r--src/kadmin/dbutil/ChangeLog6
-rw-r--r--src/kadmin/dbutil/loadv4.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 6dee87865..374052d4f 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-27 Ken Raeburn <raeburn@mit.edu>
+
+ * loadv4.c (enter_in_v5_db): Terminate argument list of
+ krb5_build_principal with NULL, not 0. Patch from Nalin
+ Dahyabhai.
+
2004-06-15 Tom Yu <tlyu@mit.edu>
* kadm5_create.c (add_admin_princs): Create kadmin/fqdn
diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
index 07bc27645..672db584b 100644
--- a/src/kadmin/dbutil/loadv4.c
+++ b/src/kadmin/dbutil/loadv4.c
@@ -540,8 +540,8 @@ Principal *princ;
retval = krb5_build_principal(context, &mod_princ,
strlen(realm), realm, princ->mod_name,
princ->mod_instance[0] ?
- princ->mod_instance : 0,
- 0);
+ princ->mod_instance : NULL,
+ NULL);
if (retval) {
krb5_free_principal(context, entry.princ);
return retval;
@@ -607,7 +607,7 @@ Principal *princ;
retval = krb5_build_principal(context, &entry.princ,
strlen(princ->instance),
princ->instance,
- "krbtgt", realm, 0);
+ "krbtgt", realm, NULL);
if (retval)
return retval;
retval = krb5_db_put_principal(context, &entry, &nentries);