Use update_printer query, rather than implementing updates as a

[moira.git] / clients / moira / printer.c

diff --git a/clients/moira/printer.c b/clients/moira/printer.c
index 5637ef40656f3fdebee9afb973781bcbce557a87..12d888ffedf2ccd8e054a9cdb07738aff54260c1 100644 (file)
--- a/clients/moira/printer.c
+++ b/clients/moira/printer.c
@@ -68,7 +68,7 @@ static char **SetDefaults(char **info, char *name)
   info[PRN_RM] = strdup("[ANY]");
   info[PRN_RP] = strdup(name);
   info[PRN_RQ] = strdup("[NONE]");
-  info[PRN_KA] = strdup("1");
+  info[PRN_KA] = strdup("0");
   info[PRN_PC] = strdup("10");
   info[PRN_AC] = strdup("[none]");
   info[PRN_LPC_ACL] = strdup("[none]");
@@ -203,11 +203,10 @@ static char *PrintPrnInfo(char **info)
  *     Returns: none.
  */
 
-static char **AskPrnInfo(char **info)
+static char **AskPrnInfo(char **info, Bool name)
 {
   char temp_buf[BUFSIZ];
-  char *args[3], *lpc_acl;
-  char *s, *d;
+  char *args[3], *lpc_acl, *newname;
   int status;
 
   Put_message("");
@@ -215,6 +214,18 @@ static char **AskPrnInfo(char **info)
   Put_message(temp_buf);
   Put_message("");
 
+  if (name)
+    {
+      while (1)
+       {
+         newname = strdup(info[PRN_NAME]);
+         if (GetValueFromUser("The new name for this printer? ", &newname) ==
+             SUB_ERROR)
+           return NULL;
+         if (ValidName(newname))
+           break;
+       }
+    }
   if (GetTypeFromUser("Type of Printer", "printertype", &info[PRN_TYPE]) ==
       SUB_ERROR)
     return NULL;
@@ -268,6 +279,9 @@ static char **AskPrnInfo(char **info)
   FreeAndClear(&info[PRN_MODBY], TRUE);
   FreeAndClear(&info[PRN_MODWITH], TRUE);
 
+  if (name)
+    SlipInNewName(info, newname);
+
   return info;
 }
 
@@ -400,7 +414,7 @@ int AddPrn(int argc, char **argv)
       return DM_NORMAL;
     }
 
-  args = AskPrnInfo(SetDefaults(info, argv[1]));
+  args = AskPrnInfo(SetDefaults(info, argv[1]), FALSE);
   if (!args)
     {
       Put_message("Aborted.");
@@ -427,25 +441,16 @@ int AddPrn(int argc, char **argv)
 void ChangePrn(char **info, Bool one_item)
 {
   int stat;
-  char **oldinfo;
 
-  oldinfo = CopyInfo(info);
-  if (!AskPrnInfo(info))
-    return;
-  if ((stat = do_mr_query("delete_printer", 1, &info[PRN_NAME], NULL, NULL)))
+  if (!AskPrnInfo(info, TRUE))
     {
-      com_err(program_name, stat, " printer not updated.");
+      Put_message("Aborted.");
       return;
     }
-  if ((stat = do_mr_query("add_printer", CountArgs(info), info, NULL, NULL)))
-    {
-      com_err(program_name, stat, " in ChngPrn");
-      if ((stat = do_mr_query("add_printer", CountArgs(oldinfo) - 3,
-                             oldinfo, NULL, NULL)))
-       com_err(program_name, stat, " while attempting to put old info back");
-    }
-  FreeInfo(oldinfo);
-  return;
+  if ((stat = do_mr_query("update_printer", CountArgs(info), info, NULL, NULL)))
+    com_err(program_name, stat, " in ChngPrn");
+  else
+    Put_message("Printer successfully updated.");
 }
 
 
@@ -526,7 +531,6 @@ int GetPrintSrv(int argc, char **argv)
 static char *PrintPrintSrvInfo(char **info)
 {
   char buf[BUFSIZ];
-  int status;
 
   if (!info)           /* If no informaion */
     {
@@ -575,9 +579,6 @@ static char **SetPrintSrvDefaults(char **info, char *name)
 static char **AskPrintSrvInfo(char **info)
 {
   char buf[BUFSIZ];
-  char *args[3], *lpc_acl;
-  char *s, *d;
-  int status;
 
   Put_message("");
   sprintf(buf, "Print Server entry for %s.", info[PRINTSERVER_HOST]);
@@ -644,7 +645,7 @@ int AddPrintSrv(int argc, char **argv)
 
 int ChangePrintSrv(int argc, char **argv)
 {
-  char *name, **args;
+  char *name;
   struct mqelem *elem = NULL;
   int stat;