Fixed bug in the options parser;forgot to check for a NULL in a while loop

Fixed typo in call to krb5_copy_keyblock

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

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 6691ddf87d27b0331232c7253a123ce20b92b297..2e41dc58b9857e0fc3b8e4bf0bbcedfc50e9822a 100644 (file)
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -312,7 +312,7 @@ void PRS(argv)
        while (word = *argv++) {
                if (*word == '-') {
                        word++;
-                       while (ch = *word++) {
+                       while (word && (ch = *word++)) {
                                switch(ch){
                                case 'f':
                                        if (*word)
@@ -513,7 +513,7 @@ kerberos_authenticate(fd, clientp, sin)
                free(name);
        }
        his_seq_num = authent->seq_number;
-       krb5_copy_keyblock(ticket->enc_part2->session, session_key);
+       krb5_copy_keyblock(ticket->enc_part2->session, &session_key);
        krb5_free_ticket(ticket);
        krb5_free_authenticator(authent);
 }