diff --git a/mbsebbs/Makefile b/mbsebbs/Makefile index c3897828..3d3a0d9a 100644 --- a/mbsebbs/Makefile +++ b/mbsebbs/Makefile @@ -13,7 +13,7 @@ SRCS = bank.c commonio.c filesub.c language.c mbtoberep.c \ safe.c timeout.c chat.c file.c getdef.c mbchat.c mbstat.c misc.c \ offline.c putpwent.c salt.c user.c mbnewusr.c input.c whoson.c \ door.c dispfile.c userlist.c timestats.c logentry.c pw_util.c \ - mblogin.c env.c snprintf.c chowntty.c ttytype.c shell.c basename.c \ + mblogin.c env.c chowntty.c ttytype.c shell.c basename.c \ failure.c pwdcheck.c pwauth.c loginprompt.c utmp.c limits.c \ setupenv.c sub.c ulimit.c log.c tz.c setugid.c HDRS = bank.h commonio.h filesub.h language.h mbsebbs.h misc.h offline.h \ @@ -24,7 +24,7 @@ HDRS = bank.h commonio.h filesub.h language.h mbsebbs.h misc.h offline.h \ pinfo.h rad64.h chat.h file.h getdef.h mbpasswd.h menu.h \ nextuser.h pop3.h safe.h timecheck.h mbnewusr.h input.h whoson.h \ door.h dispfile.h userlist.h timestats.h logentry.h lastcallers.h pw_util.h \ - mblogin.h env.h snprintf.h chowntty.h ttytype.h shell.h basename.h \ + mblogin.h env.h chowntty.h ttytype.h shell.h basename.h \ failure.h pwdcheck.h pwauth.h loginprompt.h utmp.h limits.h \ setupenv.h sub.h ulimit.h log.h tz.h setugid.h MBSEBBS_OBJS = bank.o bbslist.o chat.o file.o funcs.o mail.o menu.o \ @@ -55,7 +55,7 @@ MBUSER_LIBS = ../lib/libmemwatch.a ../lib/libclcomm.a ../lib/libcommon.a ../lib/ MBUSERADD_OBJS = mbuseradd.o MBPASSWD_OBJS = mbpasswd.o commonio.o pwio.o shadowio.o sgetpwent.o \ xmalloc.o myname.o rad64.o salt.o getdef.o encrypt.o putpwent.o pw_util.o -MBLOGIN_OBJS = getdef.o env.o snprintf.o chowntty.o ttytype.o shell.o basename.o failure.o \ +MBLOGIN_OBJS = getdef.o env.o chowntty.o ttytype.o shell.o basename.o failure.o \ pwdcheck.o pwauth.o encrypt.o loginprompt.o utmp.o limits.o setupenv.o sub.o \ xmalloc.o ulimit.o log.o tz.o setugid.o mblogin.o OTHER = Makefile @@ -222,7 +222,6 @@ logentry.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/records.h ../lib pw_util.o: pw_util.h mblogin.o: ../config.h mblogin.h getdef.h env.h chowntty.h ttytype.h basename.h shell.h failure.h pwdcheck.h pwauth.h loginprompt.h utmp.h limits.h setupenv.h sub.h ulimit.h log.h tz.h setugid.h env.o: ../config.h mblogin.h xmalloc.h -snprintf.o: snprintf.h chowntty.o: ../config.h mblogin.h getdef.h chowntty.h ttytype.o: ../config.h mblogin.h getdef.h env.h ttytype.h shell.o: ../config.h mblogin.h basename.h shell.h diff --git a/mbsebbs/mblogin.c b/mbsebbs/mblogin.c index df843fd7..8da83146 100644 --- a/mbsebbs/mblogin.c +++ b/mbsebbs/mblogin.c @@ -536,7 +536,7 @@ int main(int argc, char **argv) } } - printf("[%s]\n", username); +// printf("[%s]\n", username); #ifdef SVR4 /* @@ -625,7 +625,7 @@ top: fclose(ufp); } - if (! (pwd = getpwnam(username))) { + if ((! (pwd = getpwnam(username))) || (FoundName == 0)) { pwent.pw_name = username; strcpy(temp_pw, "!"); pwent.pw_passwd = temp_pw; diff --git a/mbsebbs/mblogin.h b/mbsebbs/mblogin.h index 74d2ebbc..1e5823d5 100644 --- a/mbsebbs/mblogin.h +++ b/mbsebbs/mblogin.h @@ -226,9 +226,9 @@ extern char *strerror(); # endif #endif -#ifndef HAVE_SNPRINTF -#include "snprintf.h" -#endif +// #ifndef HAVE_SNPRINTF +// #include "snprintf.h" +// #endif /* * string to use for the pw_passwd field in /etc/passwd when using diff --git a/mbsebbs/snprintf.c b/mbsebbs/snprintf.c deleted file mode 100644 index 240cf3f0..00000000 --- a/mbsebbs/snprintf.c +++ /dev/null @@ -1,292 +0,0 @@ -/************************************************************** - * Original: - * Patrick Powell Tue Apr 11 09:48:21 PDT 1995 - * A bombproof version of doprnt (dopr) included. - * Sigh. This sort of thing is always nasty do deal with. Note that - * the version here does not include floating point... - * - * snprintf() is used instead of sprintf() as it does limit checks - * for string length. This covers a nasty loophole. - * - * The other functions are there to prevent NULL pointers from - * causing nast effects. - **************************************************************/ - -/* $XFree86: xc/lib/misc/snprintf.c,v 3.0 1996/08/26 06:19:23 dawes Exp $ */ - -#include -#include "snprintf.h" - -static void dopr(char *, char *, va_list); -static char *end; - -/* varargs declarations: */ - -#if defined(HAVE_STDARG_H) -# include -# define HAVE_STDARGS /* let's hope that works everywhere (mj) */ -# define VA_LOCAL_DECL va_list ap; -# define VA_START(f) va_start(ap, f) -# define VA_SHIFT(v,t) ; /* no-op for ANSI */ -# define VA_END va_end(ap) -#else -# if defined(HAVE_VARARGS_H) -# include -# undef HAVE_STDARGS -# define VA_LOCAL_DECL va_list ap; -# define VA_START(f) va_start(ap) /* f is ignored! */ -# define VA_SHIFT(v,t) v = va_arg(ap,t) -# define VA_END va_end(ap) -# else -/*XX ** NO VARARGS ** XX*/ -# endif -#endif - -#ifdef HAVE_STDARGS -int snprintf (char *str, size_t count, const char *fmt, ...); -int vsnprintf (char *str, size_t count, const char *fmt, va_list arg); -#else -int snprintf (); -int vsnprintf (); -#endif - -int vsnprintf(char *str, size_t count, const char *fmt, va_list args) -{ - str[0] = 0; - end = str+count-1; - dopr( str, fmt, args ); - if( count>0 ){ - end[0] = 0; - } - return(strlen(str)); -} - -/* VARARGS3 */ -#ifdef HAVE_STDARGS -int -snprintf (char *str,size_t count,const char *fmt,...) -#else -int -snprintf (va_alist) va_dcl -#endif -{ -#ifndef HAVE_STDARGS - char *str; - size_t count; - char *fmt; -#endif - VA_LOCAL_DECL - - VA_START (fmt); - VA_SHIFT (str, char *); - VA_SHIFT (count, size_t ); - VA_SHIFT (fmt, char *); - (void) vsnprintf ( str, count, fmt, ap); - VA_END; - return( strlen( str ) ); -} - - -/* - * dopr(): poor man's version of doprintf - */ - -static void fmtstr(char *value, int ljust, int len, int zpad); -static void fmtnum(long value, int base, int dosign, int ljust, int len, int zpad); -static void dostr(char *); -static char *output; -static void dopr_outch(int c); - - - -static void dopr(char *buffer, char *format, va_list args) -{ - int ch; - long value; - int longflag = 0; - char *strvalue; - int ljust; - int len; - int zpad; - - output = buffer; - while( (ch = *format++) ){ - switch( ch ){ - case '%': - ljust = len = zpad = 0; - nextch: - ch = *format++; - switch( ch ){ - case 0: - dostr((char *)"**end of format**"); - return; - case '-': ljust = 1; goto nextch; - case '0': /* set zero padding if len not set */ - if(len==0) zpad = '0'; - case '1': case '2': case '3': - case '4': case '5': case '6': - case '7': case '8': case '9': - len = len*10 + ch - '0'; - goto nextch; - case 'l': longflag = 1; goto nextch; - case 'u': case 'U': - /*fmtnum(value,base,dosign,ljust,len,zpad) */ - if( longflag ){ - value = va_arg( args, long ); - } else { - value = va_arg( args, int ); - } - fmtnum( value, 10,0, ljust, len, zpad ); break; - case 'o': case 'O': - /*fmtnum(value,base,dosign,ljust,len,zpad) */ - if( longflag ){ - value = va_arg( args, long ); - } else { - value = va_arg( args, int ); - } - fmtnum( value, 8,0, ljust, len, zpad ); break; - case 'd': case 'D': - if( longflag ){ - value = va_arg( args, long ); - } else { - value = va_arg( args, int ); - } - fmtnum( value, 10,1, ljust, len, zpad ); break; - case 'x': - if( longflag ){ - value = va_arg( args, long ); - } else { - value = va_arg( args, int ); - } - fmtnum( value, 16,0, ljust, len, zpad ); break; - case 'X': - if( longflag ){ - value = va_arg( args, long ); - } else { - value = va_arg( args, int ); - } - fmtnum( value,-16,0, ljust, len, zpad ); break; - case 's': - strvalue = va_arg( args, char *); - fmtstr( strvalue,ljust,len,zpad ); break; - case 'c': - ch = va_arg( args, int ); - dopr_outch( ch ); break; - case '%': dopr_outch( ch ); continue; - default: - dostr((char *)"???????"); - } - longflag = 0; - break; - default: - dopr_outch( ch ); - break; - } - } - *output = 0; -} - -static void fmtstr(char *value, int ljust, int len, int zpad) -{ - int padlen, lstrlen; /* amount to pad */ - - if( value == 0 ){ - value = (char *)""; - } - for( lstrlen = 0; value[lstrlen]; ++ lstrlen ); /* strlen */ - padlen = len - lstrlen; - if( padlen < 0 ) padlen = 0; - if( ljust ) padlen = -padlen; - while( padlen > 0 ) { - dopr_outch( ' ' ); - --padlen; - } - dostr( value ); - while( padlen < 0 ) { - dopr_outch( ' ' ); - ++padlen; - } -} - - - -static void fmtnum(long value, int base, int dosign, int ljust, int len, int zpad) -{ - int signvalue = 0; - unsigned long uvalue; - char convert[20]; - int place = 0; - int padlen = 0; /* amount to pad */ - int caps = 0; - - /* DEBUGP(("value 0x%x, base %d, dosign %d, ljust %d, len %d, zpad %d\n", - value, base, dosign, ljust, len, zpad )); */ - uvalue = value; - if( dosign ){ - if( value < 0 ) { - signvalue = '-'; - uvalue = -value; - } - } - if( base < 0 ){ - caps = 1; - base = -base; - } - do{ - convert[place++] = - (caps? "0123456789ABCDEF":"0123456789abcdef") - [uvalue % (unsigned)base ]; - uvalue = (uvalue / (unsigned)base ); - }while(uvalue); - convert[place] = 0; - padlen = len - place; - if( padlen < 0 ) padlen = 0; - if( ljust ) padlen = -padlen; - /* DEBUGP(( "str '%s', place %d, sign %c, padlen %d\n", - convert,place,signvalue,padlen)); */ - if( zpad && padlen > 0 ){ - if( signvalue ){ - dopr_outch( signvalue ); - --padlen; - signvalue = 0; - } - while( padlen > 0 ){ - dopr_outch( zpad ); - --padlen; - } - } - while( padlen > 0 ) { - dopr_outch( ' ' ); - --padlen; - } - if( signvalue ) dopr_outch( signvalue ); - while( place > 0 ) dopr_outch( convert[--place] ); - while( padlen < 0 ){ - dopr_outch( ' ' ); - ++padlen; - } -} - - - -static void dostr(char *str) -{ - while(*str) dopr_outch(*str++); -} - - - -static void dopr_outch(int c) -{ - if( iscntrl(c) && c != '\n' && c != '\t' ){ - c = '@' + (c & 0x1F); - if( end == 0 || output < end ){ - *output++ = '^'; - } - } - if( end == 0 || output < end ){ - *output++ = c; - } -} - - diff --git a/mbsebbs/snprintf.h b/mbsebbs/snprintf.h deleted file mode 100644 index e900e31e..00000000 --- a/mbsebbs/snprintf.h +++ /dev/null @@ -1,51 +0,0 @@ -/* $XFree86: xc/lib/misc/snprintf.h,v 3.1 1996/08/26 14:42:33 dawes Exp $ */ - -#ifndef SNPRINTF_H -#define SNPRINTF_H - -#ifdef HAS_SNPRINTF -#ifdef LIBXT -#define _XtSnprintf snprintf -#define _XtVsnprintf vsnprintf -#endif -#ifdef LIBX11 -#define _XSnprintf snprintf -#define _XVsnprintf vsnprintf -#endif -#else /* !HAS_SNPRINTF */ - -#ifdef LIBXT -#define snprintf _XtSnprintf -#define vsnprintf _XtVsnprintf -#endif -#ifdef LIBX11 -#define snprintf _XSnprintf -#define vsnprintf _XVsnprintf -#endif - -#if 1 /* the system might have no X11 headers. -MM */ -#include -#include -#else /* but we still need this... */ -#include -/* adjust the following defines if necessary (pre-ANSI) */ -#define NeedFunctionPrototypes 1 -#define NeedVarargsPrototypes 1 -#endif - -#if NeedVarargsPrototypes -#define HAVE_STDARG_H -#endif - -#ifdef HAVE_STDARG_H -#include -extern int snprintf (char *str, size_t count, const char *fmt, ...); -extern int vsnprintf (char *str, size_t count, const char *fmt, va_list arg); -#else -extern int snprintf (); -extern int vsnprintf (); -#endif - -#endif /* HAS_SNPRINTF */ - -#endif /* SNPRINTF_H */