Add net rap file user

(This used to be commit 2972c97e5e676964585de930601f083c19080735)

diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index 23113003f0dfd75aa4d0b3129234284637c1db20..b8fe31a562dc9c3b5c9462ba7e7ff98cd0e3dba1 100644 (file)
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -1021,7 +1021,10 @@ int cli_NetFileGetInfo(struct cli_state *cli, uint32 file_id, void (*fn)(const c
 *             False     - failure
 *
 ****************************************************************************/
-int cli_NetFileEnum(struct cli_state *cli, char * user, char * base_path, void (*fn)(const char *, const char *, uint16, uint16, uint32))
+int cli_NetFileEnum(struct cli_state *cli, const char * user,
+                   const char * base_path,
+                   void (*fn)(const char *, const char *, uint16, uint16,
+                              uint32))
 {
   char *rparam = NULL;
   char *rdata = NULL;

diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index 74eda61331e69aa7406ddba01f4f9664093cd60f..b4de37488511e30f8fffd8df10364ae7aab5eb26 100644 (file)
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -108,11 +108,23 @@ static int rap_file_info(int argc, const char **argv)
 
 static int rap_file_user(int argc, const char **argv)
 {
+       struct cli_state *cli;
+       int ret;
+
        if (argc == 0)
                return net_rap_file_usage(argc, argv);
 
-       d_fprintf(stderr, "net rap file user not implemented yet\n");
-       return -1;
+       if (!NT_STATUS_IS_OK(net_make_ipc_connection(0, &cli)))
+               return -1;
+
+       /* list open files */
+
+       d_printf("\nEnumerating open files on remote server:\n\n"
+                "\nFileId  Opened by            Perms  Locks  Path \n"
+                "------  ---------            -----  -----  ---- \n");
+       ret = cli_NetFileEnum(cli, argv[0], NULL, file_fn);
+       cli_shutdown(cli);
+       return ret;
 }
 
 int net_rap_file(int argc, const char **argv)
@@ -132,10 +144,10 @@ int net_rap_file(int argc, const char **argv)
                         return -1;
 
                /* list open files */
-               d_printf(
-                "\nEnumerating open files on remote server:\n\n"\
-                "\nFileId  Opened by            Perms  Locks  Path \n"\
-                "------  ---------            -----  -----  ---- \n");
+
+               d_printf("\nEnumerating open files on remote server:\n\n"
+                        "\nFileId  Opened by            Perms  Locks  Path \n"
+                        "------  ---------            -----  -----  ---- \n");
                ret = cli_NetFileEnum(cli, NULL, NULL, file_fn);
                cli_shutdown(cli);
                return ret;