r6275: Implement RAP version of enumusers/enumgroups level 0. No, I've not gone mad,

this is to test future changes to enumeration functions...

This can successfully list users from nt4 and w2k3sp1.

Volker
(This used to be commit c73f2656fd89e227a8a3e2ab20f7393ff2c515c7)

1 files changed, 11 insertions, 7 deletions

diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index 6e8f0d088d..8205fe3fda 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -589,9 +589,7 @@ static int net_rap_user_usage(int argc, const char **argv)
 	return net_help_user(argc, argv);
 } 
 	
-static void user_fn(const char *user_name, const char *comment,
-		    const char * home_dir, const char * logon_script,
-		    void *state)
+static void user_fn(const char *user_name, void *state)
 {
 	d_printf("%-21.21s\n", user_name);
 }
@@ -696,7 +694,7 @@ int net_rap_user(int argc, const char **argv)
 			cli_shutdown(cli);
 			goto done;
 		}
-		ret = cli_RNetUserEnum(cli, user_fn, NULL); 
+		ret = cli_RNetUserEnum0(cli, user_fn, NULL); 
 		cli_shutdown(cli);
 		goto done;
 	}
@@ -721,7 +719,7 @@ static void long_group_fn(const char *group_name, const char *comment,
 	d_printf("%-21.21s %s\n", group_name, comment);
 }
 
-static void group_fn(const char *group_name, const char *comment, void *state)
+static void group_fn(const char *group_name, void *state)
 {
 	d_printf("%-21.21s\n", group_name);
 }
@@ -787,7 +785,7 @@ int net_rap_group(int argc, const char **argv)
 			cli_shutdown(cli);
 			return ret;
 		}
-		ret = cli_RNetGroupEnum(cli, group_fn, NULL); 
+		ret = cli_RNetGroupEnum0(cli, group_fn, NULL); 
 		cli_shutdown(cli);
 		return ret;
 	}
@@ -912,6 +910,12 @@ static int rap_service_stop(int argc, const char **argv)
 	return errmsg_not_implemented();
 }
 
+static void service_fn(const char *service_name, const char *dummy,
+		       void *state)
+{
+	d_printf("%-21.21s\n", service_name);
+}
+
 int net_rap_service(int argc, const char **argv)
 {
 	struct functable func[] = {
@@ -931,7 +935,7 @@ int net_rap_service(int argc, const char **argv)
 			d_printf("-----------------------------\n");
 			ret = cli_RNetServiceEnum(cli, long_group_fn, NULL);
 		}
-		ret = cli_RNetServiceEnum(cli, group_fn, NULL); 
+		ret = cli_RNetServiceEnum(cli, service_fn, NULL); 
 		cli_shutdown(cli);
 		return ret;
 	}