[vpopmail-cvs] vpopmail vadddomain.c,1.6,1.7

[Rick W. <rw...@us...>]

Update of /cvsroot/vpopmail/vpopmail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3003

Modified Files:
	vadddomain.c 
Log Message:
Check for existing domain before prompting for password

Index: vadddomain.c
===================================================================
RCS file: /cvsroot/vpopmail/vpopmail/vadddomain.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- vadddomain.c	22 May 2004 12:28:21 -0000	1.6
+++ vadddomain.c	3 Jun 2004 23:33:14 -0000	1.7
@@ -234,6 +234,12 @@
       vexit(0);
     }
 
+    /*  If it already exists, don't waste time entering the password  */
+    if( vget_assign(Domain, NULL, 0, NULL, NULL ) != NULL ) {
+       printf("Error: %s\n", verror( VA_DOMAIN_ALREADY_EXISTS ));
+       vexit( VA_DOMAIN_ALREADY_EXISTS );
+    }
+
     /* Grab the postmaster password */
     if ( optind < argc ) {
 	snprintf(Passwd, sizeof(Passwd), "%s", argv[optind]);