--- loncom/build/loncaparestoreconfigurations	2001/05/09 16:50:53	1.9
+++ loncom/build/loncaparestoreconfigurations	2002/03/03 00:21:23	1.12
@@ -25,7 +25,7 @@
 my $suffix=".rpmsave";
 my $suffixpragma="";
 if ($ARGV[0] eq 'suffix') {
-    $suffix=$ARGV[1] if $suffix=~/^[\.\w]+$/;
+    $suffix=$ARGV[1] if $ARGV[1]=~/^[\.\w]+$/;
 }
 elsif ($ARGV[0] eq 'lasttimestamp') {
     $suffixpragma="lasttimestamp";
@@ -36,7 +36,8 @@ use strict;
 
 my @special_conf_files=(
 			"/etc/httpd/conf/access.conf",
-			"/etc/smb.conf"
+			"/etc/smb.conf",
+			"/etc/samba/smb.conf"
 			);
 
 my @generic_conf_files=(
@@ -44,6 +45,8 @@ my @generic_conf_files=(
 			"/home/httpd/lonTabs/spare.tab",
 			"/etc/krb.conf",
 			"/etc/ntp.conf",
+			"/etc/httpd/conf/srm.conf",
+			"/etc/httpd/conf/httpd.conf",
 			);
 
 my @perlsetvars=("lonHostID","lonRole","lonAdmEMail","lonDefDomain","lonLoadLim","lonExpire","lonReceipt","lonSqlAccess");
@@ -54,32 +57,48 @@ foreach (@special_conf_files) {
 	    $suffix=getsuffix('/etc/httpd/conf/access.conf');
 	}
 	my $template=`/bin/cat /etc/httpd/conf/access.conf`;
-	my $rpmsave=`/bin/cat /etc/httpd/conf/access.conf$suffix`;
-	`/bin/mv /etc/httpd/conf/access.conf /etc/httpd/conf/access.conf.template`;
+	my $lpmlnew=`/bin/cat /etc/httpd/conf/access.conf$suffix`;
+#	`/bin/mv /etc/httpd/conf/access.conf /etc/httpd/conf/access.conf.template`;
 	foreach my $psv (@perlsetvars) {
-	    $rpmsave=~/\nPerlSetVar\s+$psv\s+(\S+)/;
-	    my $pval=$1;
-	    $template=~s/(\nPerlSetVar\s+$psv\s+)\S+/$1$pval/;
-	    $pvar{$psv}=$pval;
+	    if ($template=~/\nPerlSetVar\s+$psv\s+(\S+)/) {
+		my $pval=$1;
+		$lpmlnew=~s/(\nPerlSetVar\s+$psv\s+)\S+/$1$pval/;
+		$pvar{$psv}=$pval;
+	    }
 	}
-	open OUT,">/etc/httpd/conf/access.conf";
-	print OUT $template;
+	open OUT,">/etc/httpd/conf/access.conf$suffix";
+	print OUT $lpmlnew;
 	close OUT;
     }
-    if (/^\/etc\/smb.conf$/) {
+    if (/^\/etc\/smb.conf$/ and -e "/etc/smb.conf$suffix") {
 	if ($suffixpragma eq 'lasttimestamp') {
 	    $suffix=getsuffix('/etc/smb.conf');
 	}
-	my $template=`/bin/cat /etc/smb.conf`;
+	my $template=`/bin/cat /etc/smb.conf$suffix`;
+	foreach my $psv (@perlsetvars) {
+	    $template=~s/\{\{\{\{\[(.*?)\]\}\}\}\}/$pvar{$1}/ge;
+	}
+	open OUT,">/etc/smb.conf$suffix";
+	print OUT $template;
+	close OUT;
+    }
+    if (/^\/etc\/samba\/smb.conf$/ and -e "/etc/samba/smb.conf$suffix") {
+	if ($suffixpragma eq 'lasttimestamp') {
+	    $suffix=getsuffix('/etc/samba/smb.conf');
+	}
+	my $template=`/bin/cat /etc/samba/smb.conf$suffix`;
 	foreach my $psv (@perlsetvars) {
 	    $template=~s/\{\{\{\{\[(.*?)\]\}\}\}\}/$pvar{$1}/ge;
 	}
-	open OUT,">/etc/smb.conf";
+	open OUT,">/etc/samba/smb.conf$suffix";
 	print OUT $template;
 	close OUT;
     }
 }
 
+exit; # Just because this is only about restoring configuration to
+      # new files
+
 foreach (@generic_conf_files) {
     my $file=$_;
     if ($suffixpragma eq 'lasttimestamp') {