[Cvs-nserver-commits] CVS: cvs-nserver/src cvspasswd-file.c,1.2,1.3 passwd.c,1.2,1.3

[Alexey M. <ty...@us...>]

Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14789/src

Modified Files:
	cvspasswd-file.c passwd.c 
Log Message:
Merged NCLI-1-11-1 code w/ CVS 1.11.5


Index: cvspasswd-file.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/cvspasswd-file.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cvspasswd-file.c	21 Apr 2003 20:16:34 -0000	1.2
+++ cvspasswd-file.c	22 Apr 2003 18:56:58 -0000	1.3
@@ -64,6 +64,7 @@
 {
     char *passwd_line = NULL;
     size_t passwd_line_allocated = 0;
+    char* result = NULL;
 
     while (getline(&passwd_line, &passwd_line_allocated, cvspasswd) != -1)
     {
@@ -94,6 +95,7 @@
 		break;
 		
 	    case find_action_remove:
+	        result = "remove succeeded";
 		break;
 
 	    case find_action_return:
@@ -114,5 +116,5 @@
     }
     if (passwd_line_allocated)
       free(passwd_line);
-    return NULL;
+    return result;
 }

Index: passwd.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/passwd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- passwd.c	21 Apr 2003 20:16:38 -0000	1.2
+++ passwd.c	22 Apr 2003 18:56:58 -0000	1.3
@@ -232,8 +232,8 @@
     FILE *cvspasswd;
     FILE *tmpcvspasswd;
 {
-    int result;
-    result = (int) find_user(cvspasswd, tmpcvspasswd, user.name, find_action_remove);
+    char* result;
+    result = find_user(cvspasswd, tmpcvspasswd, user.name, find_action_remove);
     if (!result)
 	error(1, 0, "User %s not found", user.name);
     return 1;