sync with server: "[" isn't a wildcard character in oracle, so don't

escape it.

diff --git a/clients/moira/attach.c b/clients/moira/attach.c
index cf1ffc181419446a2628c6e59fa7edcb99e900cf..8de39015f87ee2238c298f6010244f4601c7fe5d 100644 (file)
--- a/clients/moira/attach.c
+++ b/clients/moira/attach.c
@@ -42,9 +42,7 @@
 #define GROUP        2
 #define ALIAS        3
 
-#define NO_MACHINE      ("\\[NONE\\]") /* C will remove one of the /'s here,
-                                        * and the other quotes the [ for
-                                        * ingres' regexp facility. */
+#define NO_MACHINE      ("[NONE]")
 #define NO_MACHINE_BAD  ("[NONE]")
 
 #define DEFAULT_TYPE     ("AFS")
@@ -308,10 +306,6 @@ Bool name;
        free(info[FS_MACHINE]);
        info[FS_MACHINE] = Strsave(NO_MACHINE);
     } else {
-       if (!strcmp(info[FS_MACHINE], NO_MACHINE_BAD)) {
-           free(info[FS_MACHINE]);
-           info[FS_MACHINE] = Strsave(NO_MACHINE);
-       }
        if (!strcasecmp(info[FS_TYPE], "AFS")) {
            if (!name || newdefaults) {
                free(info[FS_MACHINE]);

diff --git a/clients/moira/printer.c b/clients/moira/printer.c
index 943389528cc5a83ee437032d625ba73ef177c5c0..c6a8a62af80e53495d7eea8f771f97048d180e07 100644 (file)
--- a/clients/moira/printer.c
+++ b/clients/moira/printer.c
@@ -53,7 +53,7 @@ char * name;
     info[PCAP_SPOOL_HOST] =    Strsave(DEFAULT_MACHINE);
     info[PCAP_SPOOL_DIR] =     Strsave(spool_dir);
     info[PCAP_RPRINTER] =      Strsave(name);
-    info[PCAP_QSERVER] =       Strsave("\\[NONE\\]");
+    info[PCAP_QSERVER] =       Strsave("[NONE]");
     info[PCAP_AUTH] =          Strsave("1");
     info[PCAP_PRICE] =         Strsave("10");
     info[PCAP_COMMENTS] =      Strsave("");
@@ -148,10 +148,6 @@ char ** info;
     if (GetValueFromUser("Remote Printer Name", &info[PCAP_RPRINTER]) ==
        SUB_ERROR)
       return(NULL);
-    if (!strcmp(info[PCAP_QSERVER], "[NONE]")) {
-       free(info[PCAP_QSERVER]);
-       info[PCAP_QSERVER] = strsave("\\[NONE\\]");
-    }
     if (GetValueFromUser("Quotaserver for this printer", &info[PCAP_QSERVER]) ==
        SUB_ERROR)
       return(NULL);

diff --git a/clients/moira/quota.c b/clients/moira/quota.c
index 0ac23b7e0e010d39f65ec0149ceb60ab1ef17438..4923abcd7d9b3cd559de04d810f01ac8e832be1e 100644 (file)
--- a/clients/moira/quota.c
+++ b/clients/moira/quota.c
@@ -34,7 +34,7 @@ static char * def_quota = NULL;
   
 #define DEFAULT_FILESYS DEFAULT_NONE
 #define DEFAULT_USER user      /* this is the user who started moira. */
-#define NOBODY "\\[nobody\\]"
+#define NOBODY "[nobody]"
 #define DEFAULT_QTYPE   "USER"
 
 

diff --git a/clients/moira/utils.c b/clients/moira/utils.c
index b658cbb22fbbe02f3281d1b7b10c07990af0fe44..97cb191b5a1dbfcfd844508f6d2c7569488db656 100644 (file)
--- a/clients/moira/utils.c
+++ b/clients/moira/utils.c
@@ -414,7 +414,7 @@ char *s;
        Put_message("Please use a non-empty name.");
     else if (strchr(s, ' '))
        Put_message("You cannot use space (' ') in this name.");
-    else if (strchr(s, '*') || strchr(s, '?') || strchr(s, '['))
+    else if (strchr(s, '*') || strchr(s, '?'))
        Put_message("Wildcards not accepted here.");
     else
        return TRUE;