Menu
▾
▴
[vpopmail-cvs] vpopmail config.h.in, 1.15, 1.15.2.1 maildirquota.c, 1.8, 1.8.2.1 vchkpw.c, 1.19, 1.19.2.1
|
From: Rick W. <rw...@us...> - 2007-10-01 06:34:39
|
Update of /cvsroot/vpopmail/vpopmail In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19716 Modified Files: Tag: v5_4_24 config.h.in maildirquota.c vchkpw.c Log Message: fix signedness warnings in maildirquota and vchkpw Index: vchkpw.c =================================================================== RCS file: /cvsroot/vpopmail/vpopmail/vchkpw.c,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -d -r1.19 -r1.19.2.1 --- vchkpw.c 22 May 2007 03:59:00 -0000 1.19 +++ vchkpw.c 1 Oct 2007 06:34:29 -0000 1.19.2.1 @@ -92,8 +92,8 @@ void vlog(int verror, char *TheUser, char *TheDomain, char *ThePass, char *TheName, char *IpAddr, char *LogLine); void vchkpw_exit(int err); void run_command(char *prog); -int authcram(unsigned char *response, unsigned char *challenge, unsigned char *password); -int authapop(unsigned char *password, unsigned char *timestamp, unsigned char *clearpass); +int authcram( char *response, char *challenge, char *password); +int authapop( char *password, char *timestamp, char *clearpass); #define POP_CONN 0 #define SMTP_CONN 1 @@ -737,14 +737,25 @@ #endif } -int authcram(unsigned char *response, unsigned char *challenge, unsigned char *password) +int authcram( char *response, char *challenge, char *password) { + unsigned char *uchallenge; + unsigned char *upassword; unsigned char digest[16]; - unsigned char digascii[33]; + char digascii[33]; unsigned char h; int j; - hmac_md5( challenge, strlen(challenge), password, strlen(password), digest); + uchallenge = malloc( strlen(challenge)+1); + memcpy( uchallenge, challenge, strlen( challenge )); + + upassword = malloc( strlen(password)+1); + memcpy( upassword, password, strlen(password)+1); + + hmac_md5( uchallenge, strlen(challenge), upassword, strlen(password), digest); + + free( uchallenge ); + free( upassword ); digascii[32]=0; @@ -759,18 +770,31 @@ return(strcmp(digascii,response)); } -int authapop(unsigned char *password, unsigned char *timestamp, unsigned char *clearpass) +int authapop( char *password, char *timestamp, char *clearpass) { MD5_CTX context; unsigned char digest[16]; char encrypted[16*2+1]; char *s; int i; - + + unsigned char *utimestamp; + unsigned char *uclearpass; + + utimestamp = malloc( strlen( timestamp )); + memcpy( utimestamp, timestamp, strlen( timestamp )); + + uclearpass = malloc( strlen( clearpass )); + memcpy( uclearpass, clearpass, strlen( clearpass )); + MD5Init(&context); - MD5Update(&context, timestamp, strlen(timestamp)); - MD5Update(&context, clearpass, strlen(clearpass)); + MD5Update(&context, utimestamp, strlen(timestamp)); + MD5Update(&context, uclearpass, strlen(clearpass)); MD5Final(digest, &context); + + free( utimestamp ); + free( uclearpass ); + s = encrypted; for (i = 0; i < (int)sizeof(digest); ++i) { *s = hextab[digest[i]/16]; ++s; Index: config.h.in =================================================================== RCS file: /cvsroot/vpopmail/vpopmail/config.h.in,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -d -r1.15 -r1.15.2.1 --- config.h.in 22 May 2007 03:58:58 -0000 1.15 +++ config.h.in 1 Oct 2007 06:34:29 -0000 1.15.2.1 @@ -354,13 +354,13 @@ /* Define to `int' if <sys/types.h> does not define. */ #undef mode_t -/* Define to `long' if <sys/types.h> does not define. */ +/* Define to `long int' if <sys/types.h> does not define. */ #undef off_t /* Define to `int' if <sys/types.h> does not define. */ #undef pid_t -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t /* Define to `int' if <sys/types.h> doesn't define. */ Index: maildirquota.c =================================================================== RCS file: /cvsroot/vpopmail/vpopmail/maildirquota.c,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -r1.8 -r1.8.2.1 --- maildirquota.c 14 Mar 2004 18:00:40 -0000 1.8 +++ maildirquota.c 1 Oct 2007 06:34:29 -0000 1.8.2.1 @@ -38,19 +38,22 @@ /* private functions - no name clashes with courier */ static char *makenewmaildirsizename(const char *, int *); -static int countcurnew(const char *, time_t *, off_t *, unsigned *); +static int countcurnew(const char *, time_t *, off_t *, int *); static int countsubdir(const char *, const char *, - time_t *, off_t *, unsigned *); + time_t *, off_t *, int *); static int statcurnew(const char *, time_t *); static int statsubdir(const char *, const char *, time_t *); static int doaddquota(const char *, int, const char *, long, int, int); static int docheckquota(const char *dir, int *maildirsize_fdptr, const char *quota_type, long xtra_size, int xtra_cnt, int *percentage); -static int docount(const char *, time_t *, off_t *, unsigned *); +static int docount(const char *, time_t *, off_t *, int *); static int maildir_checkquota(const char *dir, int *maildirsize_fdptr, const char *quota_type, long xtra_size, int xtra_cnt); +/* static int maildir_addquota(const char *dir, int maildirsize_fd, const char *quota_type, long maildirsize_size, int maildirsize_cnt); +*/ + static int maildir_safeopen(const char *path, int mode, int perm); static char *str_pid_t(pid_t t, char *arg); static char *str_time_t(time_t t, char *arg); @@ -71,7 +74,7 @@ char domdir[MAX_PW_DIR]; char *p; char domain[256]; -unsigned long size = 0; +long size = 0; unsigned long maxsize = 0; int cnt = 0; int maxcnt = 0; @@ -300,7 +303,7 @@ static int maildirsize_read(const char *filename, /* The filename */ int *fdptr, /* Keep the file descriptor open */ off_t *sizeptr, /* Grand total of maildir size */ - unsigned *cntptr, /* Grand total of message count */ + int *cntptr, /* Grand total of message count */ unsigned *nlines, /* # of lines in maildirsize */ struct stat *statptr) /* The stats on maildirsize */ { @@ -462,7 +465,7 @@ struct stat stat_buf; int maildirsize_fd; off_t maildirsize_size; -unsigned maildirsize_cnt; +int maildirsize_cnt; unsigned maildirsize_nlines; int n; time_t tm; @@ -614,7 +617,7 @@ quota_type, percentage)); } -static int maildir_addquota(const char *dir, int maildirsize_fd, +int maildir_addquota(const char *dir, int maildirsize_fd, const char *quota_type, long maildirsize_size, int maildirsize_cnt) { if (!quota_type || !*quota_type) return (0); @@ -810,7 +813,7 @@ } static int countcurnew(const char *dir, time_t *maxtime, - off_t *sizep, unsigned *cntp) + off_t *sizep, int *cntp) { char *p=(char *)malloc(strlen(dir)+5); int n; @@ -828,7 +831,7 @@ } static int countsubdir(const char *dir, const char *subdir, time_t *maxtime, - off_t *sizep, unsigned *cntp) + off_t *sizep, int *cntp) { char *p; int n; @@ -846,7 +849,7 @@ } static int docount(const char *dir, time_t *dirstamp, - off_t *sizep, unsigned *cntp) + off_t *sizep, int *cntp) { struct stat stat_buf; char *p; |
