[qmailadmin-cvs] qmailadmin user.c,1.3,1.4

[<tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1:/tmp/cvs-serv27322

Modified Files:
	user.c 
Log Message:
remove code that incorrectly sets pw_gid, add comment regarding default quota.

Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- user.c	12 Oct 2003 00:42:43 -0000	1.3
+++ user.c	13 Oct 2003 22:31:10 -0000	1.4
@@ -468,12 +468,20 @@
     (mypw = vauth_getpw( Newu, Domain )) != NULL ) {
 
     /* from the load_limits() function, set user flags */
+    /* These aren't default limits, they're domain limits.
+       They should not be applied to new accounts.
     if( DisablePOP > 0 )     mypw->pw_gid |= NO_POP; 
     if( DisableIMAP > 0 )    mypw->pw_gid |= NO_IMAP; 
     if( DisableDialup > 0 )  mypw->pw_gid |= NO_DIALUP; 
     if( DisablePasswordChanging > 0 ) mypw->pw_gid |= NO_PASSWD_CHNG; 
     if( DisableWebmail > 0 ) mypw->pw_gid |= NO_WEBMAIL; 
     if( DisableRelay > 0 )  mypw->pw_gid |= NO_RELAY; 
+    */
+
+    /* Once we're sure people are using vpopmail 5.3.29 or later,
+     * we can switch back to old code (that only sets quota if
+     * there's something in the field).
+     */
     if (Limits.defaultquota > 0) {
       if (Limits.defaultmaxmsgcount > 0)
         snprintf(pw_shell, sizeof(pw_shell), "%dS,%dC", Limits.defaultquota, Limits.defaultmaxmsgcount);