[Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.16, 1.17

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7367/adminserver/admserv/newinst/src

Modified Files:
	ux-update.cc 
Log Message:
do not overwrite the dynamic console.conf file when upgrading


Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ux-update.cc	18 Nov 2005 21:15:51 -0000	1.16
+++ ux-update.cc	7 Dec 2005 22:11:07 -0000	1.17
@@ -1208,11 +1208,16 @@
    logUninstallInfo(sroot, "admin", "admin", tstr);
 
    snprintf(tstr, sizeof(tstr), "%s/admin-serv/config/console.conf", sroot);
-   snprintf(src, sizeof(tstr), "%s/shared/config/template/console.conf.tmpl", sroot);
-   replaceTokensInFile(src, tstr, consolearray);
-   chmod(tstr, S_IRUSR | S_IWUSR);
-   chown_file(SSuser, SSgroup, tstr);
-   logUninstallInfo(sroot, "admin", "admin", tstr);
+   /*
+     all of the dynamic information goes into console.conf, so we should
+     not overwrite that information during an upgrade */
+   if (stat(tstr, &st)) {
+      snprintf(src, sizeof(tstr), "%s/shared/config/template/console.conf.tmpl", sroot);
+      replaceTokensInFile(src, tstr, consolearray);
+      chmod(tstr, S_IRUSR | S_IWUSR);
+      chown_file(SSuser, SSgroup, tstr);
+      logUninstallInfo(sroot, "admin", "admin", tstr);
+   }
 
    snprintf(tstr, sizeof(tstr), "%s/start-admin", sroot);
    snprintf(src, sizeof(tstr), "%s/shared/config/template/start-admin.tmpl", sroot);