ispman/scripts ldifupdate,1.2.2.1,1.2.2.2

Update of /cvsroot/ispman/ispman/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8975/scripts

Modified Files:
      Tag: rel_1_1-bugfixes
	ldifupdate 
Log Message:
merged fixes until 1.7

Index: ldifupdate
===================================================================
RCS file: /cvsroot/ispman/ispman/scripts/ldifupdate,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- ldifupdate	1 Feb 2004 14:24:46 -0000	1.2.2.1
+++ ldifupdate	7 Feb 2004 15:23:38 -0000	1.2.2.2
@@ -175,24 +175,34 @@
 	if ($entry->get_value("ispmanDomainType") eq "replica") {
 	    $msg.=update_oc($entry,\@oc,\@oc_replicaDomain);
 	} else {
+
+	    ## normal domain
 	    $msg.=update_oc($entry,\@oc,\@oc_normalDomain);
-	}
 
-	# check ispmanDomainDefaultFileServer attribute
-	if (! defined $entry->get_value("ispmanDomainDefaultFileServer")){
-	    $msg.="WARNING! no \"Default Fileserver\" defined!\n";
-	    foreach (@default_fileserver){
-		$msg.="adding ispmanDomainDefaultFileServer: \"$_\"\n";
-		ldif_action("add","ispmanDomainDefaultFileServer",$_);
+	    # check ispmanDomainDefaultFileServer attribute
+	    if (! defined $entry->get_value("ispmanDomainDefaultFileServer")){
+		$msg.="WARNING! no \"Default Fileserver\" defined!\n";
+		if (@default_fileserver) {
+		    foreach (@default_fileserver){
+			$msg.="adding ispmanDomainDefaultFileServer: \"$_\"\n";
+			ldif_action("add","ispmanDomainDefaultFileServer",$_);
+		    }
+		} else {
+		    $msg.="Please adjust \@default_fileserver array to set them automatically\n";
+		}
 	    }
-	}
-
-	# check ispmanDomainDefaultWebServer attribute
-	if (! defined $entry->get_value("ispmanDomainDefaultWebHost")){
-	    $msg.="WARNING! no \"Default Webhost\" defined!\n";
-	    foreach (@default_webhost){
-		$msg.="adding ispmanDomainWebHost: \"$_\"\n";
-		ldif_action("add","ispmanDomainDefaultWebHost",$_);
+	    
+	    # check ispmanDomainDefaultWebServer attribute
+	    if (! defined $entry->get_value("ispmanDomainDefaultWebHost")){
+		$msg.="WARNING! no \"Default Webhost\" defined!\n";
+		if (@default_webhost) {
+		    foreach (@default_webhost){
+			$msg.="adding ispmanDomainWebHost: \"$_\"\n";
+			ldif_action("add","ispmanDomainDefaultWebHost",$_);
+		    }
+		} else {
+		    $msg.="Please adjust \@default_webhost array to set them automatically\n";
+		}
 	    }
 	}
 
@@ -268,6 +278,20 @@
 	    ldif_action("add","uid",$uid);
 	}
 
+	# checking for bogus mailHost
+	if ($entry->get_value("mailHost") &&
+	    $entry->get_value("mailHost") eq "undefined"){
+	    $msg.="deleting mailhost: undefined\n";
+	    ldif_action("delete","mailhost","undefined");
+	}
+
+	# checking for bogus fileHost
+	if ($entry->get_value("fileHost") && 
+	    $entry->get_value("fileHost") eq "undefined"){
+	    $msg.="deleting filehost: undefined\n";
+	    ldif_action("delete","filehost","undefined");
+	}
+
     } else {
 	# check other entries here	
 	



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn