diff options
| author | Mark Eichin <eichin@mit.edu> | 1994-06-15 21:01:56 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1994-06-15 21:01:56 +0000 |
| commit | 459fbde88db222f22c33366cd864ff6a9b1b57b7 (patch) | |
| tree | a775d72c5df58c9a03c60161458bd978e0bf3b89 /src/appl | |
| parent | 068c93797b9dba0410d7bdfa38e111ad373a7f1c (diff) | |
step 1: bzero->memset(,0,)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3809 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/bsd/krlogind.c | 2 | ||||
| -rw-r--r-- | src/appl/bsd/krshd.c | 2 | ||||
| -rw-r--r-- | src/appl/bsd/login.c | 14 | ||||
| -rw-r--r-- | src/appl/bsd/logutil.c | 2 | ||||
| -rw-r--r-- | src/appl/popper/pop_enter.c | 2 | ||||
| -rw-r--r-- | src/appl/popper/pop_init.c | 2 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/enc_des.c | 4 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/kerberos.c | 2 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/kerberos5.c | 4 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/krb4encpwd.c | 2 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/mem.c | 2 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/read_password.c | 4 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/rsaencpwd.c | 4 | ||||
| -rw-r--r-- | src/appl/telnet/telnet/commands.c | 2 | ||||
| -rw-r--r-- | src/appl/telnet/telnetd/sys_term.c | 4 | ||||
| -rw-r--r-- | src/appl/telnet/telnetd/telnetd-ktd.c | 2 | ||||
| -rw-r--r-- | src/appl/telnet/telnetd/telnetd.c | 2 | ||||
| -rw-r--r-- | src/appl/telnet/telnetd/termstat.c | 2 |
18 files changed, 29 insertions, 29 deletions
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c index 9b039eb70..fb5c93b0c 100644 --- a/src/appl/bsd/krlogind.c +++ b/src/appl/bsd/krlogind.c @@ -395,7 +395,7 @@ main(argc, argv) exit(2); } - bzero((char *) &sin,sizeof(sin)); + memset((char *) &sin, 0,sizeof(sin)); sin.sin_family = AF_INET; sin.sin_port = htons(debug_port); sin.sin_addr.s_addr = INADDR_ANY; diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c index c98c92129..e5e4eabf4 100644 --- a/src/appl/bsd/krshd.c +++ b/src/appl/bsd/krshd.c @@ -280,7 +280,7 @@ main(argc, argv) exit(2); } - bzero((char *) &sin,sizeof(sin)); + memset((char *) &sin, 0,sizeof(sin)); sin.sin_family = AF_INET; sin.sin_port = htons(debug_port); sin.sin_addr.s_addr = INADDR_ANY; diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c index 4b58b72c8..aeec53d74 100644 --- a/src/appl/bsd/login.c +++ b/src/appl/bsd/login.c @@ -515,7 +515,7 @@ main(argc, argv) (void) strncpy(pp, pp2, sizeof(pp)); pp[8]='\0'; namep = crypt(pp, pwd->pw_passwd); - bzero (pp, sizeof(pp)); /* To the best of my recollection, Senator... */ + memset (pp, 0, sizeof(pp)); /* To the best of my recollection, Senator... */ lpass_ok = !strcmp (namep, pwd->pw_passwd); if (pwd->pw_uid != 0) { /* Don't get tickets for root */ @@ -553,7 +553,7 @@ main(argc, argv) realm, "krbtgt", realm, DEFAULT_TKT_LIFE, pp2); - bzero (pp2, sizeof(pp2)); + memset (pp2, 0, sizeof(pp2)); (void) setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); switch (krbval) { case INTK_OK: @@ -582,7 +582,7 @@ main(argc, argv) break; } } else { - (void) bzero (pp2, sizeof(pp2)); + (void) memset (pp2, 0, sizeof(pp2)); (void) setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); } @@ -673,14 +673,14 @@ bad_login: { struct utmp utmp; - bzero((char *)&utmp, sizeof(utmp)); + memset((char *)&utmp, 0, sizeof(utmp)); login_time = time(&utmp.ut_time); (void) strncpy(utmp.ut_name, username, sizeof(utmp.ut_name)); if (hostname) (void) strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host)); else - bzero(utmp.ut_host, sizeof(utmp.ut_host)); + memset(utmp.ut_host, 0, sizeof(utmp.ut_host)); (void) strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line)); login(&utmp); } @@ -971,7 +971,7 @@ dolastlog(quiet, tty) if (hostname) (void) strncpy(ll.ll_host, hostname, sizeof(ll.ll_host)); else - (void) bzero(ll.ll_host, sizeof(ll.ll_host)); + (void) memset(ll.ll_host, 0, sizeof(ll.ll_host)); (void)write(fd, (char *)&ll, sizeof(ll)); (void)close(fd); } @@ -1026,7 +1026,7 @@ do_krb_login(host, strict) * Kerberos autologin protocol. */ - (void) bzero((char *) &sin, (int) sizeof(sin)); + (void) memset((char *) &sin, 0, (int) sizeof(sin)); if (hp) (void) bcopy (hp->h_addr, (char *)&sin.sin_addr, diff --git a/src/appl/bsd/logutil.c b/src/appl/bsd/logutil.c index 861fa89d8..132ec1857 100644 --- a/src/appl/bsd/logutil.c +++ b/src/appl/bsd/logutil.c @@ -53,7 +53,7 @@ void login(ut) (void) strncpy(ut->ut_id, ut->ut_line, sizeof(ut->ut_id)); (void) setutent(); - (void) bzero((char *)&utmp, sizeof(utmp)); + (void) memset((char *)&utmp, 0, sizeof(utmp)); (void) strncpy(utmp.ut_id, ut->ut_id, sizeof(utmp.ut_id)); utmp.ut_type = DEAD_PROCESS; (void) getutid(&utmp); diff --git a/src/appl/popper/pop_enter.c b/src/appl/popper/pop_enter.c index 1206f6b40..11e5b5f00 100644 --- a/src/appl/popper/pop_enter.c +++ b/src/appl/popper/pop_enter.c @@ -150,7 +150,7 @@ notify_recipient(name) if ((ret = ZInitialize()) == ZERR_NONE) init = 0; - bzero(¬ice, sizeof(notice)); + memset(¬ice, 0, sizeof(notice)); notice.z_kind = UNSAFE; notice.z_class = "message"; notice.z_class_inst = "pop"; diff --git a/src/appl/popper/pop_init.c b/src/appl/popper/pop_init.c index daa852fac..efa98ba55 100644 --- a/src/appl/popper/pop_init.c +++ b/src/appl/popper/pop_init.c @@ -65,7 +65,7 @@ char ** argmessage; char * trace_file_name; /* Initialize the POP parameter block */ - bzero ((char *)p,(int)sizeof(POP)); + memset ((char *)p, 0,(int)sizeof(POP)); /* Save my name in a global variable */ p->myname = argmessage[0]; diff --git a/src/appl/telnet/libtelnet/enc_des.c b/src/appl/telnet/libtelnet/enc_des.c index 8e7b44dd3..d3de50578 100644 --- a/src/appl/telnet/libtelnet/enc_des.c +++ b/src/appl/telnet/libtelnet/enc_des.c @@ -143,7 +143,7 @@ ofb64_init(server) fb64_init(fbp) register struct fb *fbp; { - bzero((void *)fbp, sizeof(*fbp)); + memset((void *)fbp, 0, sizeof(*fbp)); fbp->state[0] = fbp->state[1] = FAILED; fbp->fb_feed[0] = IAC; fbp->fb_feed[1] = SB; @@ -374,7 +374,7 @@ fb64_reply(data, cnt, fbp) break; case FB64_IV_BAD: - bzero(fbp->temp_feed, sizeof(Block)); + memset(fbp->temp_feed, 0, sizeof(Block)); fb64_stream_iv(fbp->temp_feed, &fbp->streams[DIR_ENCRYPT-1]); state = FAILED; break; diff --git a/src/appl/telnet/libtelnet/kerberos.c b/src/appl/telnet/libtelnet/kerberos.c index 57a58b41f..267337865 100644 --- a/src/appl/telnet/libtelnet/kerberos.c +++ b/src/appl/telnet/libtelnet/kerberos.c @@ -185,7 +185,7 @@ kerberos4_send(ap) return(0); } - bzero(instance, sizeof(instance)); + memset(instance, 0, sizeof(instance)); if (realm = krb_get_phost(RemoteHostName)) strncpy(instance, realm, sizeof(instance)); diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c index 19f675ccc..0bc45cc70 100644 --- a/src/appl/telnet/libtelnet/kerberos5.c +++ b/src/appl/telnet/libtelnet/kerberos5.c @@ -204,7 +204,7 @@ kerberos5_send(ap) ksum.checksum_type = CKSUMTYPE_CRC32; ksum.contents = sum; ksum.length = sizeof(sum); - bzero((Voidptr )sum, sizeof(sum)); + memset((Voidptr )sum, 0, sizeof(sum)); if (!UserNameRequested) { if (auth_debug_mode) { @@ -220,7 +220,7 @@ kerberos5_send(ap) return(0); } - bzero((char *)&creds, sizeof(creds)); + memset((char *)&creds, 0, sizeof(creds)); if (r = krb5_sname_to_principal(RemoteHostName,"host",KRB5_NT_SRV_HST, &creds.server)) { if (auth_debug_mode) diff --git a/src/appl/telnet/libtelnet/krb4encpwd.c b/src/appl/telnet/libtelnet/krb4encpwd.c index 93cbe9535..dbf25de77 100644 --- a/src/appl/telnet/libtelnet/krb4encpwd.c +++ b/src/appl/telnet/libtelnet/krb4encpwd.c @@ -311,7 +311,7 @@ krb4encpwd_reply(ap, data, cnt) gethostname(hostname, sizeof(hostname)); realm = krb_realmofhost(hostname); bcopy((void *)data, (void *)challenge, cnt); - bzero(user_passwd, sizeof(user_passwd)); + memset(user_passwd, 0, sizeof(user_passwd)); local_des_read_pw_string(user_passwd, sizeof(user_passwd)-1, "Password: ", 0); UserPassword = user_passwd; Challenge = challenge; diff --git a/src/appl/telnet/libtelnet/mem.c b/src/appl/telnet/libtelnet/mem.c index 798b4823c..33503f14e 100644 --- a/src/appl/telnet/libtelnet/mem.c +++ b/src/appl/telnet/libtelnet/mem.c @@ -109,7 +109,7 @@ memmove(dst, src, length) #define WIDEVAL 0 void -bzero(dst0, length) +memset(dst0, 0, length) void *dst0; register size_t length; #else diff --git a/src/appl/telnet/libtelnet/read_password.c b/src/appl/telnet/libtelnet/read_password.c index 4179ffca2..cebaaadcd 100644 --- a/src/appl/telnet/libtelnet/read_password.c +++ b/src/appl/telnet/libtelnet/read_password.c @@ -127,7 +127,7 @@ local_des_read_pw_string(s,max,prompt,verify) lose: if (!ok) - bzero(s, max); + memset(s, 0, max); printf("\n"); /* turn echo back on */ tty_state.sg_flags |= ECHO; @@ -138,7 +138,7 @@ lose: */ bcopy((char *)env, (char *)old_env, sizeof(env)); if (verify) - bzero(key_string, sizeof (key_string)); + memset(key_string, 0, sizeof (key_string)); s[max-1] = 0; /* force termination */ return !ok; /* return nonzero if not okay */ } diff --git a/src/appl/telnet/libtelnet/rsaencpwd.c b/src/appl/telnet/libtelnet/rsaencpwd.c index b82cc888b..4ec81206e 100644 --- a/src/appl/telnet/libtelnet/rsaencpwd.c +++ b/src/appl/telnet/libtelnet/rsaencpwd.c @@ -158,7 +158,7 @@ rsaencpwd_init(ap, server) if (server) { str_data[3] = TELQUAL_REPLY; - bzero(key_file, sizeof(key_file)); + memset(key_file, 0, sizeof(key_file)); gethostname(lhostname, sizeof(lhostname)); if ((cp = index(lhostname, '.')) != 0) *cp = '\0'; strcpy(key_file, "/etc/."); @@ -363,7 +363,7 @@ rsaencpwd_reply(ap, data, cnt) pubkey_len = DecodeValueLength(ptr); ptr += NumEncodeLengthOctets(pubkey_len); bcopy(ptr, pubkey, pubkey_len); - bzero(user_passwd, sizeof(user_passwd)); + memset(user_passwd, 0, sizeof(user_passwd)); local_des_read_pw_string(user_passwd, sizeof(user_passwd)-1, "Password: ", 0); UserPassword = user_passwd; Challenge = challenge; diff --git a/src/appl/telnet/telnet/commands.c b/src/appl/telnet/telnet/commands.c index ec9bd0554..da7b459e9 100644 --- a/src/appl/telnet/telnet/commands.c +++ b/src/appl/telnet/telnet/commands.c @@ -2228,7 +2228,7 @@ tn(argc, argv) char *cmd, *hostp = 0, *portp = 0, *user = 0; /* clear the socket address prior to use */ - bzero((char *)&sin, sizeof(sin)); + memset((char *)&sin, 0, sizeof(sin)); if (connected) { printf("?Already connected to %s\n", hostname); diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c index e4f2bbf49..5e727aff8 100644 --- a/src/appl/telnet/telnetd/sys_term.c +++ b/src/appl/telnet/telnetd/sys_term.c @@ -1100,7 +1100,7 @@ getptyslave() init_termbuf(); # ifdef TIOCGWINSZ if (def_row || def_col) { - bzero((char *)&ws, sizeof(ws)); + memset((char *)&ws, 0, sizeof(ws)); ws.ws_col = def_col; ws.ws_row = def_row; (void)ioctl(t, TIOCSWINSZ, (char *)&ws); @@ -1521,7 +1521,7 @@ start_login(host, autologin, name) * Create utmp entry for child */ - bzero(&utmpx, sizeof(utmpx)); + memset(&utmpx, 0, sizeof(utmpx)); SCPYN(utmpx.ut_user, ".telnet"); SCPYN(utmpx.ut_line, line + sizeof("/dev/") - 1); utmpx.ut_pid = pid; diff --git a/src/appl/telnet/telnetd/telnetd-ktd.c b/src/appl/telnet/telnetd/telnetd-ktd.c index 50b167498..f73a4d4f8 100644 --- a/src/appl/telnet/telnetd/telnetd-ktd.c +++ b/src/appl/telnet/telnetd/telnetd-ktd.c @@ -396,7 +396,7 @@ main(argc, argv) if (secflag) { int sz = sizeof(ss); - bzero((char *)&dv, sizeof(dv)); + memset((char *)&dv, 0, sizeof(dv)); if (getsysv(&sysv, sizeof(struct sysv)) != 0) { perror("getsysv"); diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c index c2944da73..d1c3c3176 100644 --- a/src/appl/telnet/telnetd/telnetd.c +++ b/src/appl/telnet/telnetd/telnetd.c @@ -451,7 +451,7 @@ main(argc, argv) int szi = sizeof(int); #endif /* SO_SEC_MULTI */ - bzero((char *)&dv, sizeof(dv)); + memset((char *)&dv, 0, sizeof(dv)); if (getsysv(&sysv, sizeof(struct sysv)) != 0) { perror("getsysv"); diff --git a/src/appl/telnet/telnetd/termstat.c b/src/appl/telnet/telnetd/termstat.c index a3f693122..d8b75ba4c 100644 --- a/src/appl/telnet/telnetd/termstat.c +++ b/src/appl/telnet/telnetd/termstat.c @@ -632,7 +632,7 @@ defer_terminit() if (def_col || def_row) { struct winsize ws; - bzero((char *)&ws, sizeof(ws)); + memset((char *)&ws, 0, sizeof(ws)); ws.ws_col = def_col; ws.ws_row = def_row; (void) ioctl(pty, TIOCSWINSZ, (char *)&ws); |
