oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

less warnings

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3750 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-11-02 04:07:03 +00:00
parent 9a707cbe2d
commit b3712d39f4
7 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appl/telnet/libtelnet/auth.c
View File

@@ -500,7 +500,7 @@ auth_is(unsigned char *data, int cnt)
return; return;
} }
if (ap = findauthenticator(data[0], data[1])) { if ((ap = findauthenticator(data[0], data[1]))) {
if (ap->is) if (ap->is)
(*ap->is)(ap, data+2, cnt-2); (*ap->is)(ap, data+2, cnt-2);
} else if (auth_debug_mode) } else if (auth_debug_mode)
@@ -516,7 +516,7 @@ auth_reply(unsigned char *data, int cnt)
if (cnt < 2) if (cnt < 2)
return; return;
if (ap = findauthenticator(data[0], data[1])) { if ((ap = findauthenticator(data[0], data[1]))) {
if (ap->reply) if (ap->reply)
(*ap->reply)(ap, data+2, cnt-2); (*ap->reply)(ap, data+2, cnt-2);
} else if (auth_debug_mode) } else if (auth_debug_mode)

13
appl/telnet/libtelnet/kerberos.c
View File

@@ -179,7 +179,7 @@ kerberos4_send(char *name, Authenticator *ap)
memset(instance, 0, sizeof(instance)); memset(instance, 0, sizeof(instance));
if (realm = krb_get_phost(RemoteHostName)) if ((realm = krb_get_phost(RemoteHostName)))
strncpy(instance, realm, sizeof(instance)); strncpy(instance, realm, sizeof(instance));
instance[sizeof(instance)-1] = '\0'; instance[sizeof(instance)-1] = '\0';
@@ -190,11 +190,13 @@ kerberos4_send(char *name, Authenticator *ap)
printf("Kerberos V4: no realm for %s\r\n", RemoteHostName); printf("Kerberos V4: no realm for %s\r\n", RemoteHostName);
return(0); return(0);
} }
if (r = krb_mk_req(&auth, KRB_SERVICE_NAME, instance, realm, 0L)) { r = krb_mk_req(&auth, KRB_SERVICE_NAME, instance, realm, 0L);
if (r) {
printf("mk_req failed: %s\r\n", krb_get_err_text(r)); printf("mk_req failed: %s\r\n", krb_get_err_text(r));
return(0); return(0);
} }
if (r = krb_get_cred(KRB_SERVICE_NAME, instance, realm, &cred)) { r = krb_get_cred(KRB_SERVICE_NAME, instance, realm, &cred);
if (r) {
printf("get_cred failed: %s\r\n", krb_get_err_text(r)); printf("get_cred failed: %s\r\n", krb_get_err_text(r));
return(0); return(0);
} }
@@ -288,8 +290,9 @@ kerberos4_is(Authenticator *ap, unsigned char *data, int cnt)
printf("\r\n"); printf("\r\n");
} }
k_getsockinst(0, instance, sizeof(instance)); k_getsockinst(0, instance, sizeof(instance));
if (r = krb_rd_req(&auth, KRB_SERVICE_NAME, r = krb_rd_req(&auth, KRB_SERVICE_NAME,
instance, 0, &adat, "")) { instance, 0, &adat, "");
if (r) {
if (auth_debug_mode) if (auth_debug_mode)
printf("Kerberos failed him as %s\r\n", name); printf("Kerberos failed him as %s\r\n", name);
Data(ap, KRB_REJECT, (void *)krb_get_err_text(r), -1); Data(ap, KRB_REJECT, (void *)krb_get_err_text(r), -1);

6
appl/test/tcp_server.c
View File

@@ -145,7 +145,8 @@ proto (int sock, const char *service)
errx (1, "krb5_rd_safe: %s", errx (1, "krb5_rd_safe: %s",
krb5_get_err_text(context, status)); krb5_get_err_text(context, status));
printf ("safe packet: %.*s\n", data.length, data.data); printf ("safe packet: %.*s\n", (int)data.length,
(char *)data.data);
if (krb5_net_read (context, sock, &net_len, 4) != 4) if (krb5_net_read (context, sock, &net_len, 4) != 4)
err (1, "krb5_net_read"); err (1, "krb5_net_read");
@@ -166,7 +167,8 @@ proto (int sock, const char *service)
errx (1, "krb5_rd_priv: %s", errx (1, "krb5_rd_priv: %s",
krb5_get_err_text(context, status)); krb5_get_err_text(context, status));
printf ("priv packet: %.*s\n", data.length, data.data); printf ("priv packet: %.*s\n", (int)data.length,
(char *)data.data);
return 0; return 0;
} }

1
appl/test/test_locl.h
View File

@@ -76,6 +76,7 @@
#include <errno.h> #include <errno.h>
#include <roken.h> #include <roken.h>
#include <getarg.h> #include <getarg.h>
#include <err.h>
#include <krb5.h> #include <krb5.h>
#define SERVICE "test" #define SERVICE "test"

8
kdc/kerberos4.c
View File

@@ -47,10 +47,10 @@ RCSID("$Id$");
static u_int32_t static u_int32_t
swap32(u_int32_t x) swap32(u_int32_t x)
{ {
return (x << 24) & 0xff000000 | return ((x << 24) & 0xff000000) |
(x << 8) & 0xff0000 | ((x << 8) & 0xff0000) |
(x >> 8) & 0xff00 | ((x >> 8) & 0xff00) |
(x >> 24) & 0xff; ((x >> 24) & 0xff);
} }
int int

3
kpasswd/kpasswd.c
View File

@@ -132,7 +132,8 @@ main (int argc, char **argv)
errx (1, "krb5_change_password: %s", errx (1, "krb5_change_password: %s",
krb5_get_err_text(context, ret)); krb5_get_err_text(context, ret));
printf ("%.*s\n", result_string.length, result_string.data); printf ("%.*s\n", (int)result_string.length,
(char *)result_string.data);
krb5_data_free (&result_code_string); krb5_data_free (&result_code_string);
krb5_data_free (&result_string); krb5_data_free (&result_string);

3
kpasswd/kpasswdd.c
View File

@@ -296,7 +296,8 @@ change (krb5_auth_context auth_context,
krb5_get_salt (principal, &salt); krb5_get_salt (principal, &salt);
memset (&new_keyblock, 0, sizeof(new_keyblock)); memset (&new_keyblock, 0, sizeof(new_keyblock));
old_keyblock = &ent.keys.val[0].key; old_keyblock = &ent.keys.val[0].key;
krb5_string_to_key_data (pwd_data, &salt, old_keyblock->keytype, /* XXX */ krb5_string_to_key_data (pwd_data, &salt,
old_keyblock->keytype, /* XXX */
&new_keyblock); &new_keyblock);
if (new_keyblock.keytype == old_keyblock->keytype if (new_keyblock.keytype == old_keyblock->keytype