diff options
| author | pst <pst@FreeBSD.org> | 1996-09-21 18:01:23 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1996-09-21 18:01:23 +0000 |
| commit | 8ddc5c2acbfa73f018832908bd4d02dd8420a73b (patch) | |
| tree | c1594dee9df21368508e76549bc4efae8bfa4225 | |
| parent | 25c24d56c4839f53e198209871a77513e42bb102 (diff) | |
| download | FreeBSD-src-8ddc5c2acbfa73f018832908bd4d02dd8420a73b.zip FreeBSD-src-8ddc5c2acbfa73f018832908bd4d02dd8420a73b.tar.gz | |
Fix some compilation warnings.
| -rw-r--r-- | lib/libpam/modules/pam_kerberosIV/klogin.c | 12 | ||||
| -rw-r--r-- | libexec/ftpd/popen.c | 2 | ||||
| -rw-r--r-- | libexec/rlogind/rlogind.c | 2 | ||||
| -rw-r--r-- | libexec/rshd/rshd.c | 2 | ||||
| -rw-r--r-- | usr.bin/login/klogin.c | 12 |
5 files changed, 17 insertions, 13 deletions
diff --git a/lib/libpam/modules/pam_kerberosIV/klogin.c b/lib/libpam/modules/pam_kerberosIV/klogin.c index 934cb91..4263786 100644 --- a/lib/libpam/modules/pam_kerberosIV/klogin.c +++ b/lib/libpam/modules/pam_kerberosIV/klogin.c @@ -67,18 +67,20 @@ klogin(pw, instance, localhost, password) char *instance, *localhost, *password; { int kerror; - AUTH_DAT authdata; - KTEXT_ST ticket; - struct hostent *hp; - unsigned long faddr; char realm[REALM_SZ], savehost[MAXHOSTNAMELEN]; char tkt_location[MAXPATHLEN]; char *krb_get_phost(); extern int noticketsdontcomplain; -#ifdef KLOGIN_PARANOID +#ifdef KLOGIN_PARANOID + AUTH_DAT authdata; + KTEXT_ST ticket; + struct hostent *hp; + unsigned long faddr; + noticketsdontcomplain = 0; /* enable warning message */ #endif + /* * Root logins don't use Kerberos. * If we have a realm, try getting a ticket-granting ticket diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c index 90a39cb..cdb6065 100644 --- a/libexec/ftpd/popen.c +++ b/libexec/ftpd/popen.c @@ -70,7 +70,7 @@ ftpd_popen(program, type) int argc, gargc, pdes[2], pid; char **pop, *argv[100], *gargv[1000]; - if (*type != 'r' && *type != 'w' || type[1]) + if (((*type != 'r') && (*type != 'w')) || type[1]) return (NULL); if (!pids) { diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c index 2113ccd..81b0ddc 100644 --- a/libexec/rlogind/rlogind.c +++ b/libexec/rlogind/rlogind.c @@ -697,7 +697,7 @@ do_krb_login(dest) authopts, 0, ticket, "rcmd", instance, dest, (struct sockaddr_in *) 0, - kdata, "", (bit_64 *) 0, version); + kdata, "", NULL, version); if (rc != KSUCCESS) return (rc); diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index daa9a13..6a2b12d 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -397,7 +397,7 @@ doit(fromp) rc = krb_recvauth(authopts, 0, ticket, "rcmd", instance, &fromaddr, (struct sockaddr_in *) 0, - kdata, "", (bit_64 *) 0, version); + kdata, "", NULL, version); if (rc != KSUCCESS) { error("Kerberos authentication failure: %s\n", krb_err_txt[rc]); diff --git a/usr.bin/login/klogin.c b/usr.bin/login/klogin.c index 934cb91..4263786 100644 --- a/usr.bin/login/klogin.c +++ b/usr.bin/login/klogin.c @@ -67,18 +67,20 @@ klogin(pw, instance, localhost, password) char *instance, *localhost, *password; { int kerror; - AUTH_DAT authdata; - KTEXT_ST ticket; - struct hostent *hp; - unsigned long faddr; char realm[REALM_SZ], savehost[MAXHOSTNAMELEN]; char tkt_location[MAXPATHLEN]; char *krb_get_phost(); extern int noticketsdontcomplain; -#ifdef KLOGIN_PARANOID +#ifdef KLOGIN_PARANOID + AUTH_DAT authdata; + KTEXT_ST ticket; + struct hostent *hp; + unsigned long faddr; + noticketsdontcomplain = 0; /* enable warning message */ #endif + /* * Root logins don't use Kerberos. * If we have a realm, try getting a ticket-granting ticket |
