##################################################################
#
# Tidy up the syntax of the calls to vget_assign() 
# When the dir parameter is set to NULL, the dir_len should be 0
# <mbowe@pipeline.com.au>  25 July 2003
#
##################################################################

--- ../vpopmail-5.3.21-orig/vcdb.c	Sun Mar 23 11:25:03 2003
+++ vcdb.c	Fri Jul 25 09:14:20 2003
@@ -237,7 +237,7 @@
     lowerit(user);
     lowerit(domain);
 
-    vget_assign(domain,NULL,156,&tuid,&tgid);
+    vget_assign(domain,NULL,0,&tuid,&tgid);
     myuid = geteuid();
     if ( myuid != 0 && myuid != tuid ) {
 	return(NULL);
@@ -569,7 +569,7 @@
     if ( ret != 0 ) return(ret);
 
 	/* get the owner of the domain */
-	vget_assign(domain,NULL,156,&uid,&gid);
+	vget_assign(domain,NULL,0,&uid,&gid);
 
 	/* get the current effective user */
     myuid = geteuid();
@@ -648,7 +648,7 @@
 #endif
 
 #ifdef SQWEBMAIL_PASS
-	tmpstr = vget_assign(domain, NULL, 156, &uid, &gid );
+	tmpstr = vget_assign(domain, NULL, 0, &uid, &gid );
     vsqwebmail_pass( inpw->pw_dir, inpw->pw_passwd, uid, gid);
 #endif
 
--- ../vpopmail-5.3.21-orig/vldap.c	Wed Mar 19 11:27:07 2003
+++ vldap.c	Fri Jul 25 09:14:43 2003
@@ -62,7 +62,7 @@
   lowerit(user);
   lowerit(domain);
 
-  vget_assign(domain,NULL,156,&uid,&gid);
+  vget_assign(domain,NULL,0,&uid,&gid);
   
   myuid = geteuid();
   if ( myuid != 0 && myuid != uid ) {
@@ -755,7 +755,7 @@
 	}
 /* MARK */
 #ifdef SQWEBMAIL_PASS
-    vget_assign(domain, NULL, 156, &uid, &gid );
+    vget_assign(domain, NULL, 0, &uid, &gid );
     vsqwebmail_pass( inpw->pw_dir, inpw->pw_passwd, uid, gid);
 #endif
 
--- ../vpopmail-5.3.21-orig/vmysql.c	Wed Apr  2 03:27:28 2003
+++ vmysql.c	Fri Jul 25 09:15:18 2003
@@ -328,7 +328,7 @@
  uid_t uid;
  gid_t gid;
 
-    vget_assign(domain,NULL,156,&uid,&gid);
+    vget_assign(domain,NULL,0,&uid,&gid);
     myuid = geteuid();
     if ( myuid != 0 && myuid != uid ) return(NULL);
 
@@ -648,7 +648,7 @@
     err = vcheck_vqpw(inpw, domain);
     if ( err != 0 ) return(err);
 
-    vget_assign(domain,NULL,156,&uid,&gid);
+    vget_assign(domain,NULL,0,&uid,&gid);
     myuid = geteuid();
     if ( myuid != 0 && myuid != uid ) {
         return(VA_BAD_UID);
--- ../vpopmail-5.3.21-orig/vpopmail.c	Fri Jul 18 09:55:07 2003
+++ vpopmail.c	Fri Jul 25 09:15:42 2003
@@ -109,7 +109,7 @@
   if ( strlen(domain)<3) return(VA_INVALID_DOMAIN_NAME);
 
   /* after the name is okay, check if it already exists */
-  if ( vget_assign(domain, NULL, 156, NULL, NULL ) != NULL ) {
+  if ( vget_assign(domain, NULL, 0, NULL, NULL ) != NULL ) {
     chdir(TmpBuf1);
     return(VA_DOMAIN_ALREADY_EXISTS);
   }
--- ../vpopmail-5.3.21-orig/vsybase.c	Wed Mar 19 11:27:31 2003
+++ vsybase.c	Fri Jul 25 09:15:52 2003
@@ -548,7 +548,7 @@
 	dbcancel(dbproc);
 
 #ifdef SQWEBMAIL_PASS
-	tmpstr = vget_assign(domain, NULL, 156, &uid, &gid );
+	tmpstr = vget_assign(domain, NULL, 0, &uid, &gid );
     vsqwebmail_pass( inpw->pw_dir, inpw->pw_passwd, uid, gid);
 #endif