Bug 610: update faxdeluser to work according to the new faxadduser behavior

diff --git a/man/faxdeluser.1m b/man/faxdeluser.1m
index 095b0e7035f317a72ae9b042a25a403a70353e9b..3a6f451b360226f85084e05f545456b55b2bcf6e 100644 (file)
--- a/man/faxdeluser.1m
+++ b/man/faxdeluser.1m
@@ -39,8 +39,7 @@ faxdeluser \- delete a fax user from the permissions file
 .I username
 .SH DESCRIPTION
 .I faxdeluser
-deletes a user from using HylaFAX services, updating appropriate
-permission files(see
+deletes all entries with the supplied username from the HylaFAX permissions database (see
 .IR hosts.hfaxd (${MANNUM4_5})).
 .PP
 .SH OPTIONS

diff --git a/util/faxdeluser.c b/util/faxdeluser.c
index 189980e3b0597fbc0227a267a51ab7e7c92b8b3d..dfc1910d79753c01fb06464271fab6bdbca4452b 100644 (file)
--- a/util/faxdeluser.c
+++ b/util/faxdeluser.c
@@ -45,7 +45,7 @@ main(int argc, char** argv)
     int fd;
     int i;
     int len1, len2;
-    int skip;
+    int skip, skpchr;
     char* hostfile = FAX_SPOOLDIR "/" FAX_PERMFILE;
     char buff[256];
     char newhostfile[256];
@@ -77,10 +77,15 @@ main(int argc, char** argv)
     }
     while (fgets(buff, sizeof(buff), hf)) {
         skip = 0;
+       skpchr = 0;
         for (i = optind; i < argc; i++) {
-            len1 = strcspn(buff, ":\n");
+            len1 = strcspn(buff, ":\n@$");
             len2 = strlen(argv[i]);
-            if (len1 == len2 && !strncmp(buff, argv[i], len1)) {
+           if (strspn(buff, "^") > 0) {
+               skpchr = 1;
+               len1--;
+           }
+            if (len1 == len2 && !strncmp(buff+skpchr, argv[i], len1)) {
                 skip = 1;
                 break;
             }