converted all our existing shared memory code to use a tdb database
[tprouty/samba.git] / source / utils / status.c
index 703105012efe04feaa64889d5f2caf094859f06e..8f3461c082b523f71eba513c8770356da836ed72 100644 (file)
@@ -2,7 +2,7 @@
    Unix SMB/Netbios implementation.
    Version 1.9.
    status reporting
-   Copyright (C) Andrew Tridgell 1994-1997
+   Copyright (C) Andrew Tridgell 1994-1998
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    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
+
 */
 
 /*
  * This program reports current SMB connections
  */
 
-#ifdef SYSLOG
-#undef SYSLOG
-#endif
+#define NO_SYSLOG
 
 #include "includes.h"
 
-struct connect_record crec;
-
 struct session_record{
-  int pid;
-  int uid;
+  pid_t pid;
+  uid_t uid;
   char machine[31];
   time_t start;
   struct session_record *next;
@@ -46,492 +46,297 @@ struct session_record{
 
 extern int DEBUGLEVEL;
 extern FILE *dbf;
-extern pstring myhostname;
 
 static pstring Ucrit_username = "";                   /* added by OH */
-int            Ucrit_pid[100];  /* Ugly !!! */        /* added by OH */
-int            Ucrit_MaxPid=0;                        /* added by OH */
-unsigned int   Ucrit_IsActive = 0;                    /* added by OH */
+static pid_t   Ucrit_pid[100];  /* Ugly !!! */        /* added by OH */
+static int            Ucrit_MaxPid=0;                        /* added by OH */
+static unsigned int   Ucrit_IsActive = 0;                    /* added by OH */
+static int verbose, brief;
+static int            shares_only = 0;            /* Added by RJS */
+static int            locks_only  = 0;            /* Added by RJS */
+static BOOL processes_only=False;
+
+/* we need these because we link to locking*.o */
+ void become_root(BOOL save_dir) {}
+ void unbecome_root(BOOL restore_dir) {}
 
-#ifndef FAST_SHARE_MODES
-static char *read_share_file(int fd, char *fname, char *progname)
+
+/* added by OH */
+static void Ucrit_addUsername(char *username)
 {
-  struct stat sb;
-  char *buf;
-  int size;
-
-  if(fstat(fd, &sb) != 0)
-  {
-    printf("%s: ERROR: read_share_file: Failed to do stat on share file %s (%s)\n",
-                  progname, fname, strerror(errno));
-    return 0;
-  }
-
-  if(sb.st_size == 0)
-  {
-     return 0;
-  }
-
-  /* Allocate space for the file */
-  if((buf = (char *)malloc(sb.st_size)) == NULL)
-  {
-    printf("%s: read_share_file: malloc for file size %d fail !\n", 
-              progname, (int)sb.st_size);
-    return 0;
-  }
-
-  if(lseek(fd, 0, SEEK_SET) != 0)
-  {
-    printf("%s: ERROR: read_share_file: Failed to reset position to 0 \
-for share file %s (%s)\n", progname, fname, strerror(errno));
-    if(buf)
-      free(buf);
-    return 0;
-  }
-
-  if (read(fd,buf,sb.st_size) != sb.st_size)
-  {
-    printf("%s: ERROR: read_share_file: Failed to read share file %s (%s)\n",
-               progname, fname, strerror(errno));
-    if(buf)
-      free(buf);
-    return 0;
-  }
-
-  if (IVAL(buf,SMF_VERSION_OFFSET) != LOCKING_VERSION) {
-    printf("%s: ERROR: read_share_file: share file %s has incorrect \
-locking version (was %d, should be %d).\n",fname, 
-              progname, IVAL(buf,SMF_VERSION_OFFSET), LOCKING_VERSION);
-    if(buf)
-      free(buf);
-    return 0;
-  }
-
-  /* Sanity check for file contents */
-  size = sb.st_size;
-  size -= SMF_HEADER_LENGTH; /* Remove the header */
-
-  /* Remove the filename component. */
-  size -= SVAL(buf, SMF_FILENAME_LEN_OFFSET);
-
-  /* The remaining size must be a multiple of SMF_ENTRY_LENGTH - error if not. */
-  if((size % SMF_ENTRY_LENGTH) != 0)
-  {
-    printf("%s: ERROR: read_share_file: share file %s is an incorrect length.\n", 
-             progname, fname);
-    if(buf)
-      free(buf);
-    return 0;
-  }
-
-  return buf;
+       pstrcpy(Ucrit_username, username);
+       if(strlen(Ucrit_username) > 0)
+               Ucrit_IsActive = 1;
 }
-#endif /* FAST_SHARE_MODES */
 
- int main(int argc, char *argv[])
+static unsigned int Ucrit_checkUsername(char *username)
 {
-  FILE *f;
-  pstring fname;
-  int uid, c;
-  static pstring servicesf = CONFIGFILE;
-  extern char *optarg;
-  int verbose = 0, brief =0;
-  BOOL firstopen=True;
-  BOOL processes_only=False;
-  int last_pid=0;
-#ifdef FAST_SHARE_MODES
-  pstring shmem_file_name;
-  share_mode_record *file_scanner_p;
-  smb_shm_offset_t *mode_array;
-  int bytes_free, bytes_used, bytes_overhead, bytes_total;
-#else /* FAST_SHARE_MODES */
-  void *dir;
-  char *s;
-#endif /* FAST_SHARE_MODES */
-#ifdef USE_OPLOCKS
-  int oplock_type;
-#endif /* USE_OPLOCKS */
-  int i;
-  struct session_record *ptr;
-
-
-  TimeInit();
-  setup_logging(argv[0],True);
-
-  charset_initialise();
-
-  DEBUGLEVEL = 0;
-  dbf = fopen("/dev/null","w");
-
-  if (getuid() != geteuid()) {
-    printf("smbstatus should not be run setuid\n");
-    return(1);
-  }
-
-  while ((c = getopt(argc, argv, "pds:u:b")) != EOF) {
-    switch (c) {
-    case 'b':
-      brief = 1;
-      break;
-    case 'd':
-      verbose = 1;
-      break;
-    case 'p':
-      processes_only = 1;
-      break;
-    case 's':
-      strcpy(servicesf, optarg);
-      break;
-    case 'u':                                       /* added by OH */
-      Ucrit_addUsername(optarg);                    /* added by OH */
-      break;
-    default:
-      fprintf(stderr, "Usage: %s [-d] [-p] [-s configfile] [-u username]\n", *argv); /* changed by OH */
-      return (-1);
-    }
-  }
-
-  get_myname(myhostname, NULL);
-
-  if (!lp_load(servicesf,False)) {
-    fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
-    return (-1);
-  }
-
-  if (verbose) {
-    printf("using configfile = %s\n", servicesf);
-    printf("lockdir = %s\n", *lp_lockdir() ? lp_lockdir() : "NULL");
-  }
-
-  strcpy(fname,lp_lockdir());
-  standard_sub_basic(fname);
-  trim_string(fname,"","/");
-  strcat(fname,"/STATUS..LCK");
-
-  f = fopen(fname,"r");
-  if (!f) {
-    printf("Couldn't open status file %s\n",fname);
-    if (!lp_status(-1))
-      printf("You need to have status=yes in your smb config file\n");
-    return(0);
-  }
-  else if (verbose) {
-    printf("Opened status file %s\n", fname);
-  }
-
-  uid = getuid();
-
-  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.magic == 0x280267 && process_exists(crec.pid) 
-           && Ucrit_checkUsername(uidtoname(crec.uid))                      /* added by OH */
-         )
-      {
-        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)));
-        }
-      }
-    }
-  fclose(f);
-
-  if (processes_only) exit(0);
-  
-  if (brief)
-  {
-    ptr=srecs;
-    while (ptr!=NULL)
-    {
-      printf("%-8d%-10.10s%-30.30s%s",ptr->pid,uidtoname(ptr->uid),ptr->machine,asctime(LocalTime(&(ptr->start))));
-    ptr=ptr->next;
-    }
-    printf("\n");
-    exit(0);
-  }
-
-  printf("\n");
-
-#ifdef FAST_SHARE_MODES 
-  /*******************************************************************
-  initialize the shared memory for share_mode management 
-  ******************************************************************/
-   
-  strcpy(shmem_file_name,lp_lockdir());
-  trim_string(shmem_file_name,"","/");
-  if (!*shmem_file_name) exit(-1);
-  strcat(shmem_file_name, "/SHARE_MEM_FILE");
-  if(!smb_shm_open(shmem_file_name, lp_shmem_size())) exit(-1);
-  
-  mode_array = (smb_shm_offset_t *)smb_shm_offset2addr(smb_shm_get_userdef_off());
-  if(mode_array == NULL)
-  {
-    printf("%s: base of shared memory hash array == 0! Exiting.\n", argv[0]);
-    smb_shm_close();
-    exit(-1);
-  }
-
-  for( i = 0; i < lp_shmem_hash_size(); i++)
-  {
-    smb_shm_lock_hash_entry(i);
-    if(mode_array[i] == NULL_OFFSET)
-    {
-      smb_shm_unlock_hash_entry(i);
-      continue;
-    }
-    file_scanner_p = (share_mode_record *)smb_shm_offset2addr(mode_array[i]);
-    while((file_scanner_p != 0) && (file_scanner_p->num_share_mode_entries != 0))
-    {
-      share_mode_entry *entry_scanner_p = 
-                 (share_mode_entry *)smb_shm_offset2addr(
-                                       file_scanner_p->share_mode_entries);
-
-      while(entry_scanner_p != 0)
-      {
-        struct timeval t;
-        int pid = entry_scanner_p->pid;
-        int mode = entry_scanner_p->share_mode;
-     
-        t.tv_sec = entry_scanner_p->time.tv_sec;
-        t.tv_usec = entry_scanner_p->time.tv_usec;
-        strcpy(fname, file_scanner_p->file_name);
-#ifdef USE_OPLOCKS  
-        oplock_type = entry_scanner_p->op_type;
-#endif /* USE_OPLOCKS */
-
-#else /* FAST_SHARE_MODES */
-
-     /* For slow share modes go through all the files in
-        the share mode directory and read the entries in
-        each.
-      */
-
-     dir = opendir(lp_lockdir());
-     if (!dir) 
-     {
-       printf("%s: Unable to open lock directory %s.\n", argv[0], lp_lockdir());
-       return(0);
-     }
-     while ((s=readdirname(dir))) {
-       char *buf;
-       char *base;
-       int fd;
-       pstring lname;
-       uint32 dev,inode;
-       
-       if (sscanf(s,"share.%u.%u",&dev,&inode)!=2) continue;
-       
-       strcpy(lname,lp_lockdir());
-       trim_string(lname,NULL,"/");
-       strcat(lname,"/");
-       strcat(lname,s);
-       
-       fd = open(lname,O_RDWR,0);
-       if (fd < 0) 
-       {
-         printf("%s: Unable to open share file %s.\n", argv[0], lname);
-         continue;
-       }
-
-       /* Lock the share mode file while we read it. */
-       if(fcntl_lock(fd, F_SETLKW, 0, 1, F_WRLCK) == False)
-       {
-         printf("%s: Unable to lock open share file %s.\n", argv[0], lname);
-         close(fd);
-         continue;
-       }
-
-       if(( buf = read_share_file( fd, lname, argv[0] )) == NULL)
-       {
-         close(fd);
-         continue;
-       } 
-       strcpy( fname, &buf[10]);
-       close(fd);
-      
-       base = buf + SMF_HEADER_LENGTH + SVAL(buf,SMF_FILENAME_LEN_OFFSET); 
-       for( i = 0; i < IVAL(buf, SMF_NUM_ENTRIES_OFFSET); i++)
-       {
-         char *p = base + (i*SMF_ENTRY_LENGTH);
-         struct timeval t;
-         int pid = IVAL(p,SME_PID_OFFSET);
-         int mode = IVAL(p,SME_SHAREMODE_OFFSET);
-     
-         t.tv_sec = IVAL(p,SME_SEC_OFFSET);
-         t.tv_usec = IVAL(p,SME_USEC_OFFSET);
-#ifdef USE_OPLOCKS
-         oplock_type = SVAL(p,SME_OPLOCK_TYPE_OFFSET);
-#endif /* USE_OPLOCKS */
-#endif /* FAST_SHARE_MODES */
-
-    fname[sizeof(fname)-1] = 0;
-
-    if (firstopen) {
-      firstopen=False;
-      printf("Locked files:\n");
-#ifdef USE_OPLOCKS
-      printf("Pid    DenyMode   R/W        Oplock           Name\n");
-      printf("--------------------------------------------------\n");
-#else /* USE_OPLOCKS */
-      printf("Pid    DenyMode   R/W         Name\n");
-      printf("----------------------------------\n");
-#endif /* USE_OPLOCKS */
-    }
-
-
-    printf("%-5d  ",pid);
-    switch ((mode>>4)&0xF)
-      {
-      case DENY_NONE: printf("DENY_NONE  "); break;
-      case DENY_ALL:  printf("DENY_ALL   "); break;
-      case DENY_DOS:  printf("DENY_DOS   "); break;
-      case DENY_READ: printf("DENY_READ  "); break;
-      case DENY_WRITE:printf("DENY_WRITE "); break;
-      }
-    switch (mode&0xF) 
-      {
-      case 0: printf("RDONLY     "); break;
-      case 1: printf("WRONLY     "); break;
-      case 2: printf("RDWR       "); break;
-      }
-#ifdef USE_OPLOCKS
-    if((oplock_type & (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
-      printf("EXCLUSIVE+BATCH ");
-    else if (oplock_type & EXCLUSIVE_OPLOCK)
-      printf("EXCLUSIVE       ");
-    else if (oplock_type & BATCH_OPLOCK)
-      printf("BATCH           ");
-    else
-      printf("NONE            ");
-#endif /* USE_OPLOCKS */
-    printf(" %s   %s",fname,asctime(LocalTime((time_t *)&t.tv_sec)));
-
-#ifdef FAST_SHARE_MODES
-
-        entry_scanner_p = (share_mode_entry *)smb_shm_offset2addr(
-                                    entry_scanner_p->next_share_mode_entry);
-      } /* end while entry_scanner_p */
-     file_scanner_p = (share_mode_record *)smb_shm_offset2addr(
-                                    file_scanner_p->next_offset);
-    } /* end while file_scanner_p */
-    smb_shm_unlock_hash_entry(i);
-  } /* end for */
-
-  smb_shm_get_usage(&bytes_free, &bytes_used, &bytes_overhead);
-  bytes_total = bytes_free + bytes_used + bytes_overhead;
-
-  /*******************************************************************
-  deinitialize the shared memory for share_mode management 
-  ******************************************************************/
-  smb_shm_close();
-
-#else /* FAST_SHARE_MODES */
-    } /* end for i */
-
-    if(buf)
-      free(buf);
-    base = 0;
-  } /* end while */
-  closedir(dir);
-
-#endif /* FAST_SHARE_MODES */
-  if (firstopen)
-    printf("No locked files\n");
-#ifdef FAST_SHARE_MODES
-  printf("\nShare mode memory usage (bytes):\n");
-  printf("   %d(%d%%) free + %d(%d%%) used + %d(%d%%) overhead = %d(100%%) total\n",
-        bytes_free, (bytes_free * 100)/bytes_total,
-        bytes_used, (bytes_used * 100)/bytes_total,
-        bytes_overhead, (bytes_overhead * 100)/bytes_total,
-        bytes_total);
-  
-#endif /* FAST_SHARE_MODES */
+       if ( !Ucrit_IsActive) return 1;
+       if (strcmp(Ucrit_username,username) ==0) return 1;
+       return 0;
+}
 
-  return (0);
+static void Ucrit_addPid(pid_t pid)
+{
+       int i;
+       if ( !Ucrit_IsActive) return;
+       for (i=0;i<Ucrit_MaxPid;i++)
+               if( pid == Ucrit_pid[i] ) return;
+       Ucrit_pid[Ucrit_MaxPid++] = pid;
 }
 
-/* added by OH */
-void Ucrit_addUsername(pstring username)
+static unsigned int Ucrit_checkPid(pid_t pid)
 {
-  strcpy(Ucrit_username, username);
-  if(strlen(Ucrit_username) > 0)
-    Ucrit_IsActive = 1;
+       int i;
+       if ( !Ucrit_IsActive) return 1;
+       for (i=0;i<Ucrit_MaxPid;i++)
+               if( pid == Ucrit_pid[i] ) return 1;
+       return 0;
+}
+
+
+static void print_share_mode(share_mode_entry *e, char *fname)
+{
+       static int count;
+       if (count==0) {
+               printf("Locked files:\n");
+               printf("Pid    DenyMode   R/W        Oplock           Name\n");
+               printf("--------------------------------------------------\n");
+       }
+       count++;
+
+       if (Ucrit_checkPid(e->pid)) {
+          printf("%-5d  ",(int)e->pid);
+         switch ((e->share_mode>>4)&0xF) {
+         case DENY_NONE: printf("DENY_NONE  "); break;
+         case DENY_ALL:  printf("DENY_ALL   "); break;
+         case DENY_DOS:  printf("DENY_DOS   "); break;
+         case DENY_READ: printf("DENY_READ  "); break;
+         case DENY_WRITE:printf("DENY_WRITE "); break;
+         }
+         switch (e->share_mode&0xF) {
+         case 0: printf("RDONLY     "); break;
+         case 1: printf("WRONLY     "); break;
+         case 2: printf("RDWR       "); break;
+         }
+
+         if((e->op_type & 
+            (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == 
+             (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
+               printf("EXCLUSIVE+BATCH ");
+         else if (e->op_type & EXCLUSIVE_OPLOCK)
+               printf("EXCLUSIVE       ");
+         else if (e->op_type & BATCH_OPLOCK)
+               printf("BATCH           ");
+         else if (e->op_type & LEVEL_II_OPLOCK)
+               printf("LEVEL_II        ");
+         else
+               printf("NONE            ");
+
+         printf(" %s   %s",dos_to_unix(fname,False),
+             asctime(LocalTime((time_t *)&e->time.tv_sec)));
+       }
 }
 
-unsigned int Ucrit_checkUsername(pstring username)
+
+/*******************************************************************
+ dump the elements of the profile structure
+  ******************************************************************/
+static int profile_dump(void)
 {
-  if ( !Ucrit_IsActive) return 1;
-  if (strcmp(Ucrit_username,username) ==0) return 1;
-  return 0;
+#ifndef WITH_PROFILE
+       fprintf(stderr,"ERROR: not compiled with profile support\n");
+       return -1;
+#else
+       if (!profile_setup(True)) {
+               fprintf(stderr,"Failed to initialise profile memory\n");
+               return -1;
+       }
+
+       printf("smb_count:\t%u\n", profile_p->smb_count);
+       printf("uid_changes:\t%u\n", profile_p->uid_changes);
+       return 0;
+#endif
 }
 
-void Ucrit_addPid(int pid)
+
+static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
 {
-  int i;
-  if ( !Ucrit_IsActive) return;
-  for (i=0;i<Ucrit_MaxPid;i++)
-    if( pid == Ucrit_pid[i] ) return;
-  Ucrit_pid[Ucrit_MaxPid++] = pid;
+       static pid_t last_pid;
+       struct session_record *ptr;
+       struct connections_data crec;
+
+       memcpy(&crec, dbuf.dptr, sizeof(crec));
+
+       if (crec.cnum == -1) return 0;
+
+       if (!process_exists(crec.pid) || !Ucrit_checkUsername(uidtoname(crec.uid))) {
+               return 0;
+       }
+
+       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);  
+               if (processes_only) {
+                       if (last_pid != crec.pid)
+                               printf("%d\n",(int)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),(int)crec.pid,
+                              crec.machine,crec.addr,
+                              asctime(LocalTime(&crec.start)));
+               }
+       }
+
+       return 0;
 }
 
-unsigned int   Ucrit_checkPid(int pid)
+
+
+
+ int main(int argc, char *argv[])
 {
-  int i;
-  if ( !Ucrit_IsActive) return 1;
-  for (i=0;i<Ucrit_MaxPid;i++)
-    if( pid == Ucrit_pid[i] ) return 1;
-  return 0;
+       pstring fname;
+       int c;
+       static pstring servicesf = CONFIGFILE;
+       extern char *optarg;
+       int profile_only = 0;
+       TDB_CONTEXT *tdb;
+       struct session_record *ptr;
+
+       TimeInit();
+       setup_logging(argv[0],True);
+       
+       charset_initialise();
+       
+       DEBUGLEVEL = 0;
+       dbf = stderr;
+       
+       if (getuid() != geteuid()) {
+               printf("smbstatus should not be run setuid\n");
+               return(1);
+       }
+       
+       while ((c = getopt(argc, argv, "pdLSs:u:bP")) != EOF) {
+               switch (c) {
+               case 'b':
+                       brief = 1;
+                       break;
+               case 'd':
+                       verbose = 1;
+                       break;
+               case 'L':
+                       locks_only = 1;
+                       break;
+               case 'p':
+                       processes_only = 1;
+                       break;
+               case 'P':
+                       profile_only = 1;
+                       break;
+               case 'S':
+                       shares_only = 1;
+                       break;
+               case 's':
+                       pstrcpy(servicesf, optarg);
+                       break;
+               case 'u':                                       /* added by OH */
+                       Ucrit_addUsername(optarg);                    /* added by OH */
+                       break;
+               default:
+                       fprintf(stderr, "Usage: %s [-P] [-d] [-L] [-p] [-S] [-s configfile] [-u username]\n", *argv); /* changed by OH */
+                       return (-1);
+               }
+       }
+       
+       if (!lp_load(servicesf,False,False,False)) {
+               fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
+               return (-1);
+       }
+       
+       if (verbose) {
+               printf("using configfile = %s\n", servicesf);
+       }
+       
+       if (profile_only) {
+               return profile_dump();
+       }
+       
+       tdb = tdb_open(lock_path("connections.tdb"), 0, O_RDONLY, 0);
+       if (!tdb) {
+               printf("Couldn't open status file %s\n",fname);
+               if (!lp_status(-1))
+                       printf("You need to have status=yes in your smb config file\n");
+               return(0);
+       }  else if (verbose) {
+               printf("Opened status file %s\n", fname);
+       }
+
+       if (locks_only) goto locks;
+
+       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");
+       }
+       tdb_traverse(tdb, traverse_fn1);
+
+ locks:
+       if (processes_only) exit(0);
+  
+       if (brief)  {
+               ptr=srecs;
+               while (ptr!=NULL) {
+                       printf("%-8d%-10.10s%-30.30s%s",
+                              (int)ptr->pid,uidtoname(ptr->uid),
+                              ptr->machine,
+                              asctime(LocalTime(&(ptr->start))));
+                       ptr=ptr->next;
+               }
+               printf("\n");
+               exit(0);
+       }
+
+       printf("\n");
+
+       if (!shares_only) {
+               if (!locking_init(1)) {
+                       printf("Can't initialise shared memory - exiting\n");
+                       exit(1);
+               }
+               
+               if (share_mode_forall(print_share_mode) <= 0)
+                       printf("No locked files\n");
+               
+               printf("\n");
+               
+               locking_end();
+       }
+
+       return (0);
 }