Updates smbstatus to have a -S and -L flag.

Also updated the documentation :-)

The code is ugly, we need to rewrite smbstatus someday.
(This used to be commit a2a9f55a76fc16ef1d4656332ef6b1b455bb6259)

2 files changed, 105 insertions, 71 deletions

diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index 9d049cbf07..7580ca18f0 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -8,10 +8,17 @@ smbstatus \- report on current Samba connections
 ] [
 .B \-d
 ] [
+.B \-L
+] [
 .B \-p
 ] [
+.B \-S
+] [
 .B \-s
 .I configuration file
+] [
+.b \-u
+.i username
 ]
 .SH DESCRIPTION
 This program is part of the Samba suite.
@@ -27,21 +34,30 @@ gives brief output.
 .B \-d
 gives verbose output.
 
+.B \-L
+causes smbstatus to only list locks.
+
 .B \-p
 print a list of
 .B smbd
 processes and exit. Useful for scripting.
 
+.B \-S
+causes smbstatus to only list shares.
+
 .B \-s
 .I configuration file
-
 .RS 3
 The default configuration file name is determined at compile time.
-
 The file specified contains the configuration details required by the server.
 See
 .BR smb.conf (5)
 for more information.
+
+.B \-u
+.I username
+selects information relevant to .B username only.
+
 .RE
 .SH ENVIRONMENT VARIABLES
 Not applicable.
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 97f2ab3cde..2900d3acbe 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -22,6 +22,10 @@
 
    12 aug 96: Erik.Devriendt@te6.siemens.be
    added support for shared memory implementation of share mode locking
+
+   21-Jul-1998: rsharpe@ns.aus.com (Richard Sharpe)
+   Added -L (locks only) -S (shares only) flags and code
+
 */
 
 /*
@@ -53,11 +57,14 @@ int            Ucrit_pid[100];  /* Ugly !!! */        /* added by OH */
 int            Ucrit_MaxPid=0;                        /* added by OH */
 unsigned int   Ucrit_IsActive = 0;                    /* added by OH */
 
+int            shares_only = 0;            /* Added by RJS */
+int            locks_only  = 0;            /* Added by RJS */
+
 /* we need these because we link to locking*.o */
  void become_root(BOOL save_dir) {}
  void unbecome_root(BOOL restore_dir) {}
 connection_struct Connections[MAX_CONNECTIONS];
-files_struct Files[MAX_FNUMS];
+files_struct Files[MAX_OPEN_FILES];
 struct current_user current_user;
 
 
@@ -129,7 +136,7 @@ static void print_share_mode(share_mode_entry *e, char *fname)
     return(1);
   }
 
-  while ((c = getopt(argc, argv, "pds:u:b")) != EOF) {
+  while ((c = getopt(argc, argv, "pdLSs:u:b")) != EOF) {
     switch (c) {
     case 'b':
       brief = 1;
@@ -137,9 +144,15 @@ static void print_share_mode(share_mode_entry *e, char *fname)
     case 'd':
       verbose = 1;
       break;
+    case 'L':
+      locks_only = 1;
+      break;
     case 'p':
       processes_only = 1;
       break;
+    case 'S':
+      shares_only = 1;
+      break;
     case 's':
       pstrcpy(servicesf, optarg);
       break;
@@ -147,7 +160,7 @@ static void print_share_mode(share_mode_entry *e, char *fname)
       Ucrit_addUsername(optarg);                    /* added by OH */
       break;
     default:
-      fprintf(stderr, "Usage: %s [-d] [-p] [-s configfile] [-u username]\n", *argv); /* changed by OH */
+      fprintf(stderr, "Usage: %s [-d] [-L] [-p] [-S] [-s configfile] [-u username]\n", *argv); /* changed by OH */
       return (-1);
     }
   }
@@ -182,74 +195,76 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 
   uid = getuid();
 
-  if (!processes_only) {
-    printf("\nSamba version %s\n",VERSION);
+  if (!locks_only) {
 
-    if (brief)
-    {
-      printf("PID     Username  Machine                       Time logged in\n");
-      printf("-------------------------------------------------------------------\n");
-    }
-    else
-    {
-      printf("Service      uid      gid      pid     machine\n");
-      printf("----------------------------------------------\n");
+    if (!processes_only) {
+      printf("\nSamba version %s\n",VERSION);
+
+      if (brief)
+	{
+	  printf("PID     Username  Machine                       Time logged in\n");
+	  printf("-------------------------------------------------------------------\n");
+	}
+      else
+	{
+	  printf("Service      uid      gid      pid     machine\n");
+	  printf("----------------------------------------------\n");
+	}
     }
-  }
 
-  while (!feof(f))
-    {
-      if (fread(&crec,sizeof(crec),1,f) != 1)
-	break;
-      if (crec.cnum == -1) continue;
-      if ( crec.magic == 0x280267 && process_exists(crec.pid) 
-           && Ucrit_checkUsername(uidtoname(crec.uid))                      /* added by OH */
-         )
+    while (!feof(f))
       {
-        if (brief)
-        {
-	  ptr=srecs;
-	  while (ptr!=NULL)
-	  {
-	    if ((ptr->pid==crec.pid)&&(strncmp(ptr->machine,crec.machine,30)==0)) 
-	    {
-	      if (ptr->start > crec.start)
-		ptr->start=crec.start;
-	      break;
-	    }
-	    ptr=ptr->next;
-	  }
-	  if (ptr==NULL)
+	if (fread(&crec,sizeof(crec),1,f) != 1)
+	  break;
+	if (crec.cnum == -1) continue;
+	if ( crec.magic == 0x280267 && process_exists(crec.pid) 
+	     && Ucrit_checkUsername(uidtoname(crec.uid))                      /* added by OH */
+	     )
 	  {
-	    ptr=(struct session_record *) malloc(sizeof(struct session_record));
-	    ptr->uid=crec.uid;
-	    ptr->pid=crec.pid;
-	    ptr->start=crec.start;
-	    strncpy(ptr->machine,crec.machine,30);
-	    ptr->machine[30]='\0';
-	    ptr->next=srecs;
-	    srecs=ptr;
-	  }
-        }
-        else
-        {
-	  Ucrit_addPid(crec.pid);                                             /* added by OH */
-	  if (processes_only) {
-	    if (last_pid != crec.pid)
-	      printf("%d\n",crec.pid);
-	    last_pid = crec.pid; /* XXXX we can still get repeats, have to
+	    if (brief)
+	      {
+		ptr=srecs;
+		while (ptr!=NULL)
+		  {
+		    if ((ptr->pid==crec.pid)&&(strncmp(ptr->machine,crec.machine,30)==0)) 
+		      {
+			if (ptr->start > crec.start)
+			  ptr->start=crec.start;
+			break;
+		      }
+		    ptr=ptr->next;
+		  }
+		if (ptr==NULL)
+		  {
+		    ptr=(struct session_record *) malloc(sizeof(struct session_record));
+		    ptr->uid=crec.uid;
+		    ptr->pid=crec.pid;
+		    ptr->start=crec.start;
+		    strncpy(ptr->machine,crec.machine,30);
+		    ptr->machine[30]='\0';
+		    ptr->next=srecs;
+		    srecs=ptr;
+		  }
+	      }
+	    else
+	      {
+		Ucrit_addPid(crec.pid);                                             /* added by OH */
+		if (processes_only) {
+		  if (last_pid != crec.pid)
+		    printf("%d\n",crec.pid);
+		  last_pid = crec.pid; /* XXXX we can still get repeats, have to
 				    add a sort at some time */
+		}
+		else	  
+		  printf("%-10.10s   %-8s %-8s %5d   %-8s (%s) %s",
+			 crec.name,uidtoname(crec.uid),gidtoname(crec.gid),crec.pid,
+			 crec.machine,crec.addr,
+			 asctime(LocalTime(&crec.start)));
+	      }
 	  }
-	  else	  
-	    printf("%-10.10s   %-8s %-8s %5d   %-8s (%s) %s",
-		   crec.name,uidtoname(crec.uid),gidtoname(crec.gid),crec.pid,
-		   crec.machine,crec.addr,
-		   asctime(LocalTime(&crec.start)));
-        }
       }
-    }
-  fclose(f);
-
+    fclose(f);
+  }
   if (processes_only) exit(0);
   
   if (brief)
@@ -266,16 +281,19 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 
   printf("\n");
 
-  locking_init(1);
+  if (!shares_only) {
 
-  if (share_mode_forall(print_share_mode) <= 0)
-    printf("No locked files\n");
+    locking_init(1);
 
-  printf("\n");
+    if (share_mode_forall(print_share_mode) <= 0)
+      printf("No locked files\n");
+    
+    printf("\n");
 
-  share_status(stdout);
+    share_status(stdout);
 
-  locking_end();
+    locking_end();
+  }
 
   return (0);
 }