Use new krb5_adm_connect() calling sequence

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5947 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog
index 10eebef44fccdd9b55a4be2d2511368da4433b38..fc5827c89431fc31d1a30674d446e0bf46f1c1e7 100644 (file)
--- a/src/kadmin/kpasswd/ChangeLog
+++ b/src/kadmin/kpasswd/ChangeLog
@@ -1,4 +1,9 @@
 
+Mon Jun 5 13:48:23 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * kpasswd.c - Change argument list to krb5_adm_connect() for new
+               calling sequence.  We take the defaults here.
+
+
 Tue May 9 15:27:36 EDT 1995    Paul Park       (pjpark@mit.edu)
        Fix compiler warnings.
 

diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c
index 42abcf86d9768b4f2e16900379b966fc8739012d..2c015dc204c8c44a16486209de9a376125080868 100644 (file)
--- a/src/kadmin/kpasswd/kpasswd.c
+++ b/src/kadmin/kpasswd/kpasswd.c
@@ -280,7 +280,9 @@ main(argc, argv)
                                opassword,
                                &conn_socket, 
                                &auth_context,
-                               &ccache)) {
+                               &ccache,
+                               (char *) NULL,
+                               0)) {
        switch (kret) {
        case KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN:
            fprintf(stderr, kpwd_bad_client_fmt, argv[0],

diff --git a/src/windows/cns/changelo b/src/windows/cns/changelo
index 721abbdba189157cd1f871d30f5d6e9af72c0139..ce3cae9c2318d88a8922a9e448e4bdd87da057fa 100644 (file)
--- a/src/windows/cns/changelo
+++ b/src/windows/cns/changelo
@@ -1,3 +1,7 @@
+
+Mon Jun 5 14:19:51 EDT 1995    Paul Park       (pjpark@mit.edu)
+       * kpasswd.c : Use new krb5_adm_connect() calling sequence.
+
 Fri Jun 2 11:45:23 1995 Keith Vetter (keithv@fusion.com)
 
        * makefile: cleaned up and made consistent with telnet's makefile.

diff --git a/src/windows/cns/kpasswd.c b/src/windows/cns/kpasswd.c
index 2a79b84f703016ff1cc3b4adc3218feb5306f6cc..93939e095de0731674141095cfc9c7c161b9d51c 100644 (file)
--- a/src/windows/cns/kpasswd.c
+++ b/src/windows/cns/kpasswd.c
@@ -130,12 +130,13 @@ k5_change_password (
        if (name == NULL)
                return ENOMEM;
        sprintf (name, "%s@%s", user, realm);
+       ccache = (krb5_ccache) NULL;
 
 /*
 ** Establish the connection.
 */
        kret = krb5_adm_connect (k5context, name,       NULL, opasswd, &conn_socket,
-                                                       &auth_context, &ccache);
+                                                       &auth_context, &ccache, NULL, 0);
        if (kret)
                goto done;
 /*