r19810: more merge work....does not compile currently. Working on smbd merge

3 files changed, 121 insertions, 418 deletions

diff --git a/source/utils/net_sam.c b/source/utils/net_sam.c
index 9edbc7b8cf4..03e0ff0a9c3 100644
--- a/source/utils/net_sam.c
+++ b/source/utils/net_sam.c
@@ -206,23 +206,20 @@ static int net_sam_set_pwnoexp(int argc, const char **argv)
 }
 
 /*
- * Set a user's time field
+ * Set pass last change time, based on force pass change now
  */
 
-static int net_sam_set_time(int argc, const char **argv, const char *field,
-			    BOOL (*fn)(struct samu *, time_t,
-				       enum pdb_value_state))
+static int net_sam_set_pwdmustchangenow(int argc, const char **argv)
 {
 	struct samu *sam_acct = NULL;
 	DOM_SID sid;
 	enum lsa_SidType type;
 	const char *dom, *name;
 	NTSTATUS status;
-	time_t new_time;
 
-	if (argc != 2) {
-		d_fprintf(stderr, "usage: net sam set %s <user> "
-			  "[now|YYYY-MM-DD HH:MM]\n", field);
+	if ((argc != 2) || (!strequal(argv[1], "yes") &&
+			    !strequal(argv[1], "no"))) {
+		d_fprintf(stderr, "usage: net sam set pwdmustchangenow <user> [yes|no]\n");
 		return -1;
 	}
 
@@ -238,22 +235,6 @@ static int net_sam_set_time(int argc, const char **argv, const char *field,
 		return -1;
 	}
 
-	if (strequal(argv[1], "now")) {
-		new_time = time(NULL);
-	} else {
-		struct tm tm;
-		char *end;
-		ZERO_STRUCT(tm);
-		end = strptime(argv[1], "%Y-%m-%d %H:%M", &tm);
-		new_time = mktime(&tm);
-		if ((end == NULL) || (*end != '\0') || (new_time == -1)) {
-			d_fprintf(stderr, "Could not parse time string %s\n",
-				  argv[1]);
-			return -1;
-		}
-	}
-
-
 	if ( !(sam_acct = samu_new( NULL )) ) {
 		d_fprintf(stderr, "Internal error\n");
 		return -1;
@@ -264,9 +245,10 @@ static int net_sam_set_time(int argc, const char **argv, const char *field,
 		return -1;
 	}
 
-	if (!fn(sam_acct, new_time, PDB_CHANGED)) {
-		d_fprintf(stderr, "Internal error\n");
-		return -1;
+	if (strequal(argv[1], "yes")) {
+		pdb_set_pass_last_set_time(sam_acct, 0, PDB_CHANGED);
+	} else {
+		pdb_set_pass_last_set_time(sam_acct, time(NULL), PDB_CHANGED);
 	}
 
 	status = pdb_update_sam_account(sam_acct);
@@ -278,21 +260,11 @@ static int net_sam_set_time(int argc, const char **argv, const char *field,
 
 	TALLOC_FREE(sam_acct);
 
-	d_printf("Updated %s for %s\\%s to %s\n", field, dom, name, argv[1]);
+	d_fprintf(stderr, "Updated 'user must change password at next logon' for %s\\%s to %s\n", dom,
+		  name, argv[1]);
 	return 0;
 }
 
-static int net_sam_set_pwdmustchange(int argc, const char **argv)
-{
-	return net_sam_set_time(argc, argv, "pwdmustchange",
-				pdb_set_pass_must_change_time);
-}
-
-static int net_sam_set_pwdcanchange(int argc, const char **argv)
-{
-	return net_sam_set_time(argc, argv, "pwdcanchange",
-				pdb_set_pass_can_change_time);
-}
 
 /*
  * Set a user's or a group's comment
@@ -376,10 +348,8 @@ static int net_sam_set(int argc, const char **argv)
 		  "Disable/Enable a user's lockout flag" },
 		{ "pwnoexp", net_sam_set_pwnoexp,
 		  "Disable/Enable whether a user's pw does not expire" },
-		{ "pwdmustchange", net_sam_set_pwdmustchange,
-		  "Set a users password must change time" },
-		{ "pwdcanchange", net_sam_set_pwdcanchange,
-		  "Set a users password can change time" },
+		{ "pwdmustchangenow", net_sam_set_pwdmustchangenow,
+		  "Force users password must change at next logon" },
 		{NULL, NULL}
 	};
 
@@ -387,6 +357,80 @@ static int net_sam_set(int argc, const char **argv)
 }
 
 /*
+ * Change account policies
+ */
+
+static int net_sam_policy(int argc, const char **argv)
+{
+	
+	const char *account_policy = NULL;
+	uint32 value, old_value;
+	int field;
+
+	if ((argc < 1) || (argc > 2)) {
+		d_fprintf(stderr, "usage: net sam policy \"<account policy>\" "
+			  "-> show current value\n");
+		d_fprintf(stderr, "usage: net sam policy \"<account policy>\" "
+			  "<value> -> set a new value\n");
+		return -1;
+	}
+
+	account_policy = argv[0];
+	field = account_policy_name_to_fieldnum(account_policy);
+
+	if (field == 0) {
+		char *apn = account_policy_names_list();
+		d_fprintf(stderr, "No account policy by that name!\n");
+		if (apn) {
+			d_fprintf(stderr, "Valid account policies "
+				  "are:\n%s\n", apn);
+		}
+		SAFE_FREE(apn);
+		return -1;
+	}
+
+	if (!pdb_get_account_policy(field, &old_value)) {
+		fprintf(stderr, "Valid account policy, but unable to "
+			"fetch value!\n");
+		return -1;
+	}
+
+	if (argc == 1) {
+		/*
+		 * Just read the value
+		 */
+
+		printf("Account policy \"%s\" description: %s\n",
+		       account_policy, account_policy_get_desc(field));
+		printf("Account policy \"%s\" value is: %d\n", account_policy,
+		       old_value);
+		return 0;
+	}
+
+	/*
+	 * Here we know we have 2 args, so set it
+	 */
+	
+	value = strtoul(argv[1], NULL, 10);
+
+	printf("Account policy \"%s\" description: %s\n", account_policy,
+	       account_policy_get_desc(field));
+	printf("Account policy \"%s\" value was: %d\n", account_policy,
+	       old_value);
+
+	if (!pdb_set_account_policy(field, value)) {
+		d_fprintf(stderr, "Setting account policy %s to %u failed \n",
+			  account_policy, value);
+	}
+
+	printf("Account policy \"%s\" value is now: %d\n", account_policy,
+	       value);
+
+	return 0;
+}
+
+
+/*
  * Map a unix group to a domain group
  */
 
@@ -1232,6 +1276,8 @@ int net_sam(int argc, const char **argv)
 		  "Show details of a SAM entry" },
 		{ "set", net_sam_set,
 		  "Set details of a SAM account" },
+		{ "policy", net_sam_policy,
+		  "Set account policies" },
 #ifdef HAVE_LDAP
 		{ "provision", net_sam_provision,
 		  "Provision a clean User Database" },
diff --git a/source/utils/net_time.c b/source/utils/net_time.c
index f6486286a65..f6269627dab 100644
--- a/source/utils/net_time.c
+++ b/source/utils/net_time.c
@@ -30,8 +30,10 @@ static time_t cli_servertime(const char *host, struct in_addr *ip, int *zone)
 	time_t ret = 0;
 	struct cli_state *cli = NULL;
 
-	cli = cli_initialise(NULL);
-	if (!cli) goto done;
+	cli = cli_initialise();
+	if (!cli) {
+		goto done;
+	}
 
 	if (!cli_connect(cli, host, ip)) {
 		fprintf(stderr,"Can't contact server\n");
@@ -58,7 +60,9 @@ static time_t cli_servertime(const char *host, struct in_addr *ip, int *zone)
 	if (zone) *zone = cli->serverzone;
 
 done:
-	if (cli) cli_shutdown(cli);
+	if (cli) {
+		cli_shutdown(cli);
+	}
 	return ret;
 }
 
diff --git a/source/utils/status.c b/source/utils/status.c
index 163d99a2f69..4f66501511b 100644
--- a/source/utils/status.c
+++ b/source/utils/status.c
@@ -48,6 +48,9 @@ static BOOL numeric_only = False;
 
 const char *username = NULL;
 
+extern BOOL status_profile_dump(BOOL be_verbose);
+extern BOOL status_profile_rates(BOOL be_verbose);
+
 /* added by OH */
 static void Ucrit_addUid(uid_t uid)
 {
@@ -98,7 +101,10 @@ static BOOL Ucrit_addPid( pid_t pid )
 	return True;
 }
 
-static void print_share_mode(const struct share_mode_entry *e, const char *sharepath, const char *fname)
+static void print_share_mode(const struct share_mode_entry *e,
+			     const char *sharepath,
+			     const char *fname,
+			     void *dummy)
 {
 	static int count;
 
@@ -182,368 +188,6 @@ static void print_brl(SMB_DEV_T dev,
 	       (double)start, (double)size);
 }
 
-
-/*******************************************************************
- dump the elements of the profile structure
-  ******************************************************************/
-static int profile_dump(void)
-{
-#ifdef WITH_PROFILE
-	if (!profile_setup(True)) {
-		fprintf(stderr,"Failed to initialise profile memory\n");
-		return -1;
-	}
-
-	d_printf("smb_count:                      %u\n", profile_p->smb_count);
-	d_printf("uid_changes:                    %u\n", profile_p->uid_changes);
-	d_printf("************************ System Calls ****************************\n");
-	d_printf("opendir_count:                  %u\n", profile_p->syscall_opendir_count);
-	d_printf("opendir_time:                   %u\n", profile_p->syscall_opendir_time);
-	d_printf("readdir_count:                  %u\n", profile_p->syscall_readdir_count);
-	d_printf("readdir_time:                   %u\n", profile_p->syscall_readdir_time);
-	d_printf("mkdir_count:                    %u\n", profile_p->syscall_mkdir_count);
-	d_printf("mkdir_time:                     %u\n", profile_p->syscall_mkdir_time);
-	d_printf("rmdir_count:                    %u\n", profile_p->syscall_rmdir_count);
-	d_printf("rmdir_time:                     %u\n", profile_p->syscall_rmdir_time);
-	d_printf("closedir_count:                 %u\n", profile_p->syscall_closedir_count);
-	d_printf("closedir_time:                  %u\n", profile_p->syscall_closedir_time);
-	d_printf("open_count:                     %u\n", profile_p->syscall_open_count);
-	d_printf("open_time:                      %u\n", profile_p->syscall_open_time);
-	d_printf("close_count:                    %u\n", profile_p->syscall_close_count);
-	d_printf("close_time:                     %u\n", profile_p->syscall_close_time);
-	d_printf("read_count:                     %u\n", profile_p->syscall_read_count);
-	d_printf("read_time:                      %u\n", profile_p->syscall_read_time);
-	d_printf("read_bytes:                     %u\n", profile_p->syscall_read_bytes);
-	d_printf("write_count:                    %u\n", profile_p->syscall_write_count);
-	d_printf("write_time:                     %u\n", profile_p->syscall_write_time);
-	d_printf("write_bytes:                    %u\n", profile_p->syscall_write_bytes);
-	d_printf("pread_count:                    %u\n", profile_p->syscall_pread_count);
-	d_printf("pread_time:                     %u\n", profile_p->syscall_pread_time);
-	d_printf("pread_bytes:                    %u\n", profile_p->syscall_pread_bytes);
-	d_printf("pwrite_count:                   %u\n", profile_p->syscall_pwrite_count);
-	d_printf("pwrite_time:                    %u\n", profile_p->syscall_pwrite_time);
-	d_printf("pwrite_bytes:                   %u\n", profile_p->syscall_pwrite_bytes);
-#ifdef WITH_SENDFILE
-	d_printf("sendfile_count:                 %u\n", profile_p->syscall_sendfile_count);
-	d_printf("sendfile_time:                  %u\n", profile_p->syscall_sendfile_time);
-	d_printf("sendfile_bytes:                 %u\n", profile_p->syscall_sendfile_bytes);
-#endif
-	d_printf("lseek_count:                    %u\n", profile_p->syscall_lseek_count);
-	d_printf("lseek_time:                     %u\n", profile_p->syscall_lseek_time);
-	d_printf("rename_count:                   %u\n", profile_p->syscall_rename_count);
-	d_printf("rename_time:                    %u\n", profile_p->syscall_rename_time);
-	d_printf("fsync_count:                    %u\n", profile_p->syscall_fsync_count);
-	d_printf("fsync_time:                     %u\n", profile_p->syscall_fsync_time);
-	d_printf("stat_count:                     %u\n", profile_p->syscall_stat_count);
-	d_printf("stat_time:                      %u\n", profile_p->syscall_stat_time);
-	d_printf("fstat_count:                    %u\n", profile_p->syscall_fstat_count);
-	d_printf("fstat_time:                     %u\n", profile_p->syscall_fstat_time);
-	d_printf("lstat_count:                    %u\n", profile_p->syscall_lstat_count);
-	d_printf("lstat_time:                     %u\n", profile_p->syscall_lstat_time);
-	d_printf("unlink_count:                   %u\n", profile_p->syscall_unlink_count);
-	d_printf("unlink_time:                    %u\n", profile_p->syscall_unlink_time);
-	d_printf("chmod_count:                    %u\n", profile_p->syscall_chmod_count);
-	d_printf("chmod_time:                     %u\n", profile_p->syscall_chmod_time);
-	d_printf("fchmod_count:                   %u\n", profile_p->syscall_fchmod_count);
-	d_printf("fchmod_time:                    %u\n", profile_p->syscall_fchmod_time);
-	d_printf("chown_count:                    %u\n", profile_p->syscall_chown_count);
-	d_printf("chown_time:                     %u\n", profile_p->syscall_chown_time);
-	d_printf("fchown_count:                   %u\n", profile_p->syscall_fchown_count);
-	d_printf("fchown_time:                    %u\n", profile_p->syscall_fchown_time);
-	d_printf("chdir_count:                    %u\n", profile_p->syscall_chdir_count);
-	d_printf("chdir_time:                     %u\n", profile_p->syscall_chdir_time);
-	d_printf("getwd_count:                    %u\n", profile_p->syscall_getwd_count);
-	d_printf("getwd_time:                     %u\n", profile_p->syscall_getwd_time);
-	d_printf("utime_count:                    %u\n", profile_p->syscall_utime_count);
-	d_printf("utime_time:                     %u\n", profile_p->syscall_utime_time);
-	d_printf("ftruncate_count:                %u\n", profile_p->syscall_ftruncate_count);
-	d_printf("ftruncate_time:                 %u\n", profile_p->syscall_ftruncate_time);
-	d_printf("fcntl_lock_count:               %u\n", profile_p->syscall_fcntl_lock_count);
-	d_printf("fcntl_lock_time:                %u\n", profile_p->syscall_fcntl_lock_time);
-	d_printf("readlink_count:                 %u\n", profile_p->syscall_readlink_count);
-	d_printf("readlink_time:                  %u\n", profile_p->syscall_readlink_time);
-	d_printf("symlink_count:                  %u\n", profile_p->syscall_symlink_count);
-	d_printf("symlink_time:                   %u\n", profile_p->syscall_symlink_time);
-	d_printf("************************ Statcache *******************************\n");
-	d_printf("lookups:                        %u\n", profile_p->statcache_lookups);
-	d_printf("misses:                         %u\n", profile_p->statcache_misses);
-	d_printf("hits:                           %u\n", profile_p->statcache_hits);
-	d_printf("************************ Writecache ******************************\n");
-	d_printf("read_hits:                      %u\n", profile_p->writecache_read_hits);
-	d_printf("abutted_writes:                 %u\n", profile_p->writecache_abutted_writes);
-	d_printf("total_writes:                   %u\n", profile_p->writecache_total_writes);
-	d_printf("non_oplock_writes:              %u\n", profile_p->writecache_non_oplock_writes);
-	d_printf("direct_writes:                  %u\n", profile_p->writecache_direct_writes);
-	d_printf("init_writes:                    %u\n", profile_p->writecache_init_writes);
-	d_printf("flushed_writes[SEEK]:           %u\n", profile_p->writecache_flushed_writes[SEEK_FLUSH]);
-	d_printf("flushed_writes[READ]:           %u\n", profile_p->writecache_flushed_writes[READ_FLUSH]);
-	d_printf("flushed_writes[WRITE]:          %u\n", profile_p->writecache_flushed_writes[WRITE_FLUSH]);
-	d_printf("flushed_writes[READRAW]:        %u\n", profile_p->writecache_flushed_writes[READRAW_FLUSH]);
-	d_printf("flushed_writes[OPLOCK_RELEASE]: %u\n", profile_p->writecache_flushed_writes[OPLOCK_RELEASE_FLUSH]);
-	d_printf("flushed_writes[CLOSE]:          %u\n", profile_p->writecache_flushed_writes[CLOSE_FLUSH]);
-	d_printf("flushed_writes[SYNC]:           %u\n", profile_p->writecache_flushed_writes[SYNC_FLUSH]);
-	d_printf("flushed_writes[SIZECHANGE]:     %u\n", profile_p->writecache_flushed_writes[SIZECHANGE_FLUSH]);
-	d_printf("num_perfect_writes:             %u\n", profile_p->writecache_num_perfect_writes);
-	d_printf("num_write_caches:               %u\n", profile_p->writecache_num_write_caches);
-	d_printf("allocated_write_caches:         %u\n", profile_p->writecache_allocated_write_caches);
-	d_printf("************************ SMB Calls *******************************\n");
-	d_printf("mkdir_count:                    %u\n", profile_p->SMBmkdir_count);
-	d_printf("mkdir_time:                     %u\n", profile_p->SMBmkdir_time);
-	d_printf("rmdir_count:                    %u\n", profile_p->SMBrmdir_count);
-	d_printf("rmdir_time:                     %u\n", profile_p->SMBrmdir_time);
-	d_printf("open_count:                     %u\n", profile_p->SMBopen_count);
-	d_printf("open_time:                      %u\n", profile_p->SMBopen_time);
-	d_printf("create_count:                   %u\n", profile_p->SMBcreate_count);
-	d_printf("create_time:                    %u\n", profile_p->SMBcreate_time);
-	d_printf("close_count:                    %u\n", profile_p->SMBclose_count);
-	d_printf("close_time:                     %u\n", profile_p->SMBclose_time);
-	d_printf("flush_count:                    %u\n", profile_p->SMBflush_count);
-	d_printf("flush_time:                     %u\n", profile_p->SMBflush_time);
-	d_printf("unlink_count:                   %u\n", profile_p->SMBunlink_count);
-	d_printf("unlink_time:                    %u\n", profile_p->SMBunlink_time);
-	d_printf("mv_count:                       %u\n", profile_p->SMBmv_count);
-	d_printf("mv_time:                        %u\n", profile_p->SMBmv_time);
-	d_printf("getatr_count:                   %u\n", profile_p->SMBgetatr_count);
-	d_printf("getatr_time:                    %u\n", profile_p->SMBgetatr_time);
-	d_printf("setatr_count:                   %u\n", profile_p->SMBsetatr_count);
-	d_printf("setatr_time:                    %u\n", profile_p->SMBsetatr_time);
-	d_printf("read_count:                     %u\n", profile_p->SMBread_count);
-	d_printf("read_time:                      %u\n", profile_p->SMBread_time);
-	d_printf("write_count:                    %u\n", profile_p->SMBwrite_count);
-	d_printf("write_time:                     %u\n", profile_p->SMBwrite_time);
-	d_printf("lock_count:                     %u\n", profile_p->SMBlock_count);
-	d_printf("lock_time:                      %u\n", profile_p->SMBlock_time);
-	d_printf("unlock_count:                   %u\n", profile_p->SMBunlock_count);
-	d_printf("unlock_time:                    %u\n", profile_p->SMBunlock_time);
-	d_printf("ctemp_count:                    %u\n", profile_p->SMBctemp_count);
-	d_printf("ctemp_time:                     %u\n", profile_p->SMBctemp_time);
-	d_printf("mknew_count:                    %u\n", profile_p->SMBmknew_count);
-	d_printf("mknew_time:                     %u\n", profile_p->SMBmknew_time);
-	d_printf("chkpth_count:                   %u\n", profile_p->SMBchkpth_count);
-	d_printf("chkpth_time:                    %u\n", profile_p->SMBchkpth_time);
-	d_printf("exit_count:                     %u\n", profile_p->SMBexit_count);
-	d_printf("exit_time:                      %u\n", profile_p->SMBexit_time);
-	d_printf("lseek_count:                    %u\n", profile_p->SMBlseek_count);
-	d_printf("lseek_time:                     %u\n", profile_p->SMBlseek_time);
-	d_printf("lockread_count:                 %u\n", profile_p->SMBlockread_count);
-	d_printf("lockread_time:                  %u\n", profile_p->SMBlockread_time);
-	d_printf("writeunlock_count:              %u\n", profile_p->SMBwriteunlock_count);
-	d_printf("writeunlock_time:               %u\n", profile_p->SMBwriteunlock_time);
-	d_printf("readbraw_count:                 %u\n", profile_p->SMBreadbraw_count);
-	d_printf("readbraw_time:                  %u\n", profile_p->SMBreadbraw_time);
-	d_printf("readBmpx_count:                 %u\n", profile_p->SMBreadBmpx_count);
-	d_printf("readBmpx_time:                  %u\n", profile_p->SMBreadBmpx_time);
-	d_printf("readBs_count:                   %u\n", profile_p->SMBreadBs_count);
-	d_printf("readBs_time:                    %u\n", profile_p->SMBreadBs_time);
-	d_printf("writebraw_count:                %u\n", profile_p->SMBwritebraw_count);
-	d_printf("writebraw_time:                 %u\n", profile_p->SMBwritebraw_time);
-	d_printf("writeBmpx_count:                %u\n", profile_p->SMBwriteBmpx_count);
-	d_printf("writeBmpx_time:                 %u\n", profile_p->SMBwriteBmpx_time);
-	d_printf("writeBs_count:                  %u\n", profile_p->SMBwriteBs_count);
-	d_printf("writeBs_time:                   %u\n", profile_p->SMBwriteBs_time);
-	d_printf("writec_count:                   %u\n", profile_p->SMBwritec_count);
-	d_printf("writec_time:                    %u\n", profile_p->SMBwritec_time);
-	d_printf("setattrE_count:                 %u\n", profile_p->SMBsetattrE_count);
-	d_printf("setattrE_time:                  %u\n", profile_p->SMBsetattrE_time);
-	d_printf("getattrE_count:                 %u\n", profile_p->SMBgetattrE_count);
-	d_printf("getattrE_time:                  %u\n", profile_p->SMBgetattrE_time);
-	d_printf("lockingX_count:                 %u\n", profile_p->SMBlockingX_count);
-	d_printf("lockingX_time:                  %u\n", profile_p->SMBlockingX_time);
-	d_printf("trans_count:                    %u\n", profile_p->SMBtrans_count);
-	d_printf("trans_time:                     %u\n", profile_p->SMBtrans_time);
-	d_printf("transs_count:                   %u\n", profile_p->SMBtranss_count);
-	d_printf("transs_time:                    %u\n", profile_p->SMBtranss_time);
-	d_printf("ioctl_count:                    %u\n", profile_p->SMBioctl_count);
-	d_printf("ioctl_time:                     %u\n", profile_p->SMBioctl_time);
-	d_printf("ioctls_count:                   %u\n", profile_p->SMBioctls_count);
-	d_printf("ioctls_time:                    %u\n", profile_p->SMBioctls_time);
-	d_printf("copy_count:                     %u\n", profile_p->SMBcopy_count);
-	d_printf("copy_time:                      %u\n", profile_p->SMBcopy_time);
-	d_printf("move_count:                     %u\n", profile_p->SMBmove_count);
-	d_printf("move_time:                      %u\n", profile_p->SMBmove_time);
-	d_printf("echo_count:                     %u\n", profile_p->SMBecho_count);
-	d_printf("echo_time:                      %u\n", profile_p->SMBecho_time);
-	d_printf("writeclose_count:               %u\n", profile_p->SMBwriteclose_count);
-	d_printf("writeclose_time:                %u\n", profile_p->SMBwriteclose_time);
-	d_printf("openX_count:                    %u\n", profile_p->SMBopenX_count);
-	d_printf("openX_time:                     %u\n", profile_p->SMBopenX_time);
-	d_printf("readX_count:                    %u\n", profile_p->SMBreadX_count);
-	d_printf("readX_time:                     %u\n", profile_p->SMBreadX_time);
-	d_printf("writeX_count:                   %u\n", profile_p->SMBwriteX_count);
-	d_printf("writeX_time:                    %u\n", profile_p->SMBwriteX_time);
-	d_printf("trans2_count:                   %u\n", profile_p->SMBtrans2_count);
-	d_printf("trans2_time:                    %u\n", profile_p->SMBtrans2_time);
-	d_printf("transs2_count:                  %u\n", profile_p->SMBtranss2_count);
-	d_printf("transs2_time:                   %u\n", profile_p->SMBtranss2_time);
-	d_printf("findclose_count:                %u\n", profile_p->SMBfindclose_count);
-	d_printf("findclose_time:                 %u\n", profile_p->SMBfindclose_time);
-	d_printf("findnclose_count:               %u\n", profile_p->SMBfindnclose_count);
-	d_printf("findnclose_time:                %u\n", profile_p->SMBfindnclose_time);
-	d_printf("tcon_count:                     %u\n", profile_p->SMBtcon_count);
-	d_printf("tcon_time:                      %u\n", profile_p->SMBtcon_time);
-	d_printf("tdis_count:                     %u\n", profile_p->SMBtdis_count);
-	d_printf("tdis_time:                      %u\n", profile_p->SMBtdis_time);
-	d_printf("negprot_count:                  %u\n", profile_p->SMBnegprot_count);
-	d_printf("negprot_time:                   %u\n", profile_p->SMBnegprot_time);
-	d_printf("sesssetupX_count:               %u\n", profile_p->SMBsesssetupX_count);
-	d_printf("sesssetupX_time:                %u\n", profile_p->SMBsesssetupX_time);
-	d_printf("ulogoffX_count:                 %u\n", profile_p->SMBulogoffX_count);
-	d_printf("ulogoffX_time:                  %u\n", profile_p->SMBulogoffX_time);
-	d_printf("tconX_count:                    %u\n", profile_p->SMBtconX_count);
-	d_printf("tconX_time:                     %u\n", profile_p->SMBtconX_time);
-	d_printf("dskattr_count:                  %u\n", profile_p->SMBdskattr_count);
-	d_printf("dskattr_time:                   %u\n", profile_p->SMBdskattr_time);
-	d_printf("search_count:                   %u\n", profile_p->SMBsearch_count);
-	d_printf("search_time:                    %u\n", profile_p->SMBsearch_time);
-	d_printf("ffirst_count:                   %u\n", profile_p->SMBffirst_count);
-	d_printf("ffirst_time:                    %u\n", profile_p->SMBffirst_time);
-	d_printf("funique_count:                  %u\n", profile_p->SMBfunique_count);
-	d_printf("funique_time:                   %u\n", profile_p->SMBfunique_time);
-	d_printf("fclose_count:                   %u\n", profile_p->SMBfclose_count);
-	d_printf("fclose_time:                    %u\n", profile_p->SMBfclose_time);
-	d_printf("nttrans_count:                  %u\n", profile_p->SMBnttrans_count);
-	d_printf("nttrans_time:                   %u\n", profile_p->SMBnttrans_time);
-	d_printf("nttranss_count:                 %u\n", profile_p->SMBnttranss_count);
-	d_printf("nttranss_time:                  %u\n", profile_p->SMBnttranss_time);
-	d_printf("ntcreateX_count:                %u\n", profile_p->SMBntcreateX_count);
-	d_printf("ntcreateX_time:                 %u\n", profile_p->SMBntcreateX_time);
-	d_printf("ntcancel_count:                 %u\n", profile_p->SMBntcancel_count);
-	d_printf("ntcancel_time:                  %u\n", profile_p->SMBntcancel_time);
-	d_printf("splopen_count:                  %u\n", profile_p->SMBsplopen_count);
-	d_printf("splopen_time:                   %u\n", profile_p->SMBsplopen_time);
-	d_printf("splwr_count:                    %u\n", profile_p->SMBsplwr_count);
-	d_printf("splwr_time:                     %u\n", profile_p->SMBsplwr_time);
-	d_printf("splclose_count:                 %u\n", profile_p->SMBsplclose_count);
-	d_printf("splclose_time:                  %u\n", profile_p->SMBsplclose_time);
-	d_printf("splretq_count:                  %u\n", profile_p->SMBsplretq_count);
-	d_printf("splretq_time:                   %u\n", profile_p->SMBsplretq_time);
-	d_printf("sends_count:                    %u\n", profile_p->SMBsends_count);
-	d_printf("sends_time:                     %u\n", profile_p->SMBsends_time);
-	d_printf("sendb_count:                    %u\n", profile_p->SMBsendb_count);
-	d_printf("sendb_time:                     %u\n", profile_p->SMBsendb_time);
-	d_printf("fwdname_count:                  %u\n", profile_p->SMBfwdname_count);
-	d_printf("fwdname_time:                   %u\n", profile_p->SMBfwdname_time);
-	d_printf("cancelf_count:                  %u\n", profile_p->SMBcancelf_count);
-	d_printf("cancelf_time:                   %u\n", profile_p->SMBcancelf_time);
-	d_printf("getmac_count:                   %u\n", profile_p->SMBgetmac_count);
-	d_printf("getmac_time:                    %u\n", profile_p->SMBgetmac_time);
-	d_printf("sendstrt_count:                 %u\n", profile_p->SMBsendstrt_count);
-	d_printf("sendstrt_time:                  %u\n", profile_p->SMBsendstrt_time);
-	d_printf("sendend_count:                  %u\n", profile_p->SMBsendend_count);
-	d_printf("sendend_time:                   %u\n", profile_p->SMBsendend_time);
-	d_printf("sendtxt_count:                  %u\n", profile_p->SMBsendtxt_count);
-	d_printf("sendtxt_time:                   %u\n", profile_p->SMBsendtxt_time);
-	d_printf("invalid_count:                  %u\n", profile_p->SMBinvalid_count);
-	d_printf("invalid_time:                   %u\n", profile_p->SMBinvalid_time);
-	d_printf("************************ Pathworks Calls *************************\n");
-	d_printf("setdir_count:                   %u\n", profile_p->pathworks_setdir_count);
-	d_printf("setdir_time:                    %u\n", profile_p->pathworks_setdir_time);
-	d_printf("************************ Trans2 Calls ****************************\n");
-	d_printf("open_count:                     %u\n", profile_p->Trans2_open_count);
-	d_printf("open_time:                      %u\n", profile_p->Trans2_open_time);
-	d_printf("findfirst_count:                %u\n", profile_p->Trans2_findfirst_count);
-	d_printf("findfirst_time:                 %u\n", profile_p->Trans2_findfirst_time);
-	d_printf("findnext_count:                 %u\n", profile_p->Trans2_findnext_count);
-	d_printf("findnext_time:                  %u\n", profile_p->Trans2_findnext_time);
-	d_printf("qfsinfo_count:                  %u\n", profile_p->Trans2_qfsinfo_count);
-	d_printf("qfsinfo_time:                   %u\n", profile_p->Trans2_qfsinfo_time);
-	d_printf("setfsinfo_count:                %u\n", profile_p->Trans2_setfsinfo_count);
-	d_printf("setfsinfo_time:                 %u\n", profile_p->Trans2_setfsinfo_time);
-	d_printf("qpathinfo_count:                %u\n", profile_p->Trans2_qpathinfo_count);
-	d_printf("qpathinfo_time:                 %u\n", profile_p->Trans2_qpathinfo_time);
-	d_printf("setpathinfo_count:              %u\n", profile_p->Trans2_setpathinfo_count);
-	d_printf("setpathinfo_time:               %u\n", profile_p->Trans2_setpathinfo_time);
-	d_printf("qfileinfo_count:                %u\n", profile_p->Trans2_qfileinfo_count);
-	d_printf("qfileinfo_time:                 %u\n", profile_p->Trans2_qfileinfo_time);
-	d_printf("setfileinfo_count:              %u\n", profile_p->Trans2_setfileinfo_count);
-	d_printf("setfileinfo_time:               %u\n", profile_p->Trans2_setfileinfo_time);
-	d_printf("fsctl_count:                    %u\n", profile_p->Trans2_fsctl_count);
-	d_printf("fsctl_time:                     %u\n", profile_p->Trans2_fsctl_time);
-	d_printf("ioctl_count:                    %u\n", profile_p->Trans2_ioctl_count);
-	d_printf("ioctl_time:                     %u\n", profile_p->Trans2_ioctl_time);
-	d_printf("findnotifyfirst_count:          %u\n", profile_p->Trans2_findnotifyfirst_count);
-	d_printf("findnotifyfirst_time:           %u\n", profile_p->Trans2_findnotifyfirst_time);
-	d_printf("findnotifynext_count:           %u\n", profile_p->Trans2_findnotifynext_count);
-	d_printf("findnotifynext_time:            %u\n", profile_p->Trans2_findnotifynext_time);
-	d_printf("mkdir_count:                    %u\n", profile_p->Trans2_mkdir_count);
-	d_printf("mkdir_time:                     %u\n", profile_p->Trans2_mkdir_time);
-	d_printf("session_setup_count:            %u\n", profile_p->Trans2_session_setup_count);
-	d_printf("session_setup_time:             %u\n", profile_p->Trans2_session_setup_time);
-	d_printf("get_dfs_referral_count:         %u\n", profile_p->Trans2_get_dfs_referral_count);
-	d_printf("get_dfs_referral_time:          %u\n", profile_p->Trans2_get_dfs_referral_time);
-	d_printf("report_dfs_inconsistancy_count: %u\n", profile_p->Trans2_report_dfs_inconsistancy_count);
-	d_printf("report_dfs_inconsistancy_time:  %u\n", profile_p->Trans2_report_dfs_inconsistancy_time);
-	d_printf("************************ NT Transact Calls ***********************\n");
-	d_printf("create_count:                   %u\n", profile_p->NT_transact_create_count);
-	d_printf("create_time:                    %u\n", profile_p->NT_transact_create_time);
-	d_printf("ioctl_count:                    %u\n", profile_p->NT_transact_ioctl_count);
-	d_printf("ioctl_time:                     %u\n", profile_p->NT_transact_ioctl_time);
-	d_printf("set_security_desc_count:        %u\n", profile_p->NT_transact_set_security_desc_count);
-	d_printf("set_security_desc_time:         %u\n", profile_p->NT_transact_set_security_desc_time);
-	d_printf("notify_change_count:            %u\n", profile_p->NT_transact_notify_change_count);
-	d_printf("notify_change_time:             %u\n", profile_p->NT_transact_notify_change_time);
-	d_printf("rename_count:                   %u\n", profile_p->NT_transact_rename_count);
-	d_printf("rename_time:                    %u\n", profile_p->NT_transact_rename_time);
-	d_printf("query_security_desc_count:      %u\n", profile_p->NT_transact_query_security_desc_count);
-	d_printf("query_security_desc_time:       %u\n", profile_p->NT_transact_query_security_desc_time);
-	d_printf("************************ ACL Calls *******************************\n");
-	d_printf("get_nt_acl_count:               %u\n", profile_p->get_nt_acl_count);
-	d_printf("get_nt_acl_time:                %u\n", profile_p->get_nt_acl_time);
-	d_printf("fget_nt_acl_count:              %u\n", profile_p->fget_nt_acl_count);
-	d_printf("fget_nt_acl_time:               %u\n", profile_p->fget_nt_acl_time);
-	d_printf("set_nt_acl_count:               %u\n", profile_p->set_nt_acl_count);
-	d_printf("set_nt_acl_time:                %u\n", profile_p->set_nt_acl_time);
-	d_printf("fset_nt_acl_count:              %u\n", profile_p->fset_nt_acl_count);
-	d_printf("fset_nt_acl_time:               %u\n", profile_p->fset_nt_acl_time);
-	d_printf("chmod_acl_count:                %u\n", profile_p->chmod_acl_count);
-	d_printf("chmod_acl_time:                 %u\n", profile_p->chmod_acl_time);
-	d_printf("fchmod_acl_count:               %u\n", profile_p->fchmod_acl_count);
-	d_printf("fchmod_acl_time:                %u\n", profile_p->fchmod_acl_time);
-	d_printf("************************ NMBD Calls ****************************\n");
-	d_printf("name_release_count:             %u\n", profile_p->name_release_count);
-	d_printf("name_release_time:              %u\n", profile_p->name_release_time);
-	d_printf("name_refresh_count:             %u\n", profile_p->name_refresh_count);
-	d_printf("name_refresh_time:              %u\n", profile_p->name_refresh_time);
-	d_printf("name_registration_count:        %u\n", profile_p->name_registration_count);
-	d_printf("name_registration_time:         %u\n", profile_p->name_registration_time);
-	d_printf("node_status_count:              %u\n", profile_p->node_status_count);
-	d_printf("node_status_time:               %u\n", profile_p->node_status_time);
-	d_printf("name_query_count:               %u\n", profile_p->name_query_count);
-	d_printf("name_query_time:                %u\n", profile_p->name_query_time);
-	d_printf("host_announce_count:            %u\n", profile_p->host_announce_count);
-	d_printf("host_announce_time:             %u\n", profile_p->host_announce_time);
-	d_printf("workgroup_announce_count:       %u\n", profile_p->workgroup_announce_count);
-	d_printf("workgroup_announce_time:        %u\n", profile_p->workgroup_announce_time);
-	d_printf("local_master_announce_count:    %u\n", profile_p->local_master_announce_count);
-	d_printf("local_master_announce_time:     %u\n", profile_p->local_master_announce_time);
-	d_printf("master_browser_announce_count:  %u\n", profile_p->master_browser_announce_count);
-	d_printf("master_browser_announce_time:   %u\n", profile_p->master_browser_announce_time);
-	d_printf("lm_host_announce_count:         %u\n", profile_p->lm_host_announce_count);
-	d_printf("lm_host_announce_time:          %u\n", profile_p->lm_host_announce_time);
-	d_printf("get_backup_list_count:          %u\n", profile_p->get_backup_list_count);
-	d_printf("get_backup_list_time:           %u\n", profile_p->get_backup_list_time);
-	d_printf("reset_browser_count:            %u\n", profile_p->reset_browser_count);
-	d_printf("reset_browser_time:             %u\n", profile_p->reset_browser_time);
-	d_printf("announce_request_count:         %u\n", profile_p->announce_request_count);
-	d_printf("announce_request_time:          %u\n", profile_p->announce_request_time);
-	d_printf("lm_announce_request_count:      %u\n", profile_p->lm_announce_request_count);
-	d_printf("lm_announce_request_time:       %u\n", profile_p->lm_announce_request_time);
-	d_printf("domain_logon_count:             %u\n", profile_p->domain_logon_count);
-	d_printf("domain_logon_time:              %u\n", profile_p->domain_logon_time);
-	d_printf("sync_browse_lists_count:        %u\n", profile_p->sync_browse_lists_count);
-	d_printf("sync_browse_lists_time:         %u\n", profile_p->sync_browse_lists_time);
-	d_printf("run_elections_count:            %u\n", profile_p->run_elections_count);
-	d_printf("run_elections_time:             %u\n", profile_p->run_elections_time);
-	d_printf("election_count:                 %u\n", profile_p->election_count);
-	d_printf("election_time:                  %u\n", profile_p->election_time);
-#else /* WITH_PROFILE */
-	fprintf(stderr, "Profile data unavailable\n");
-#endif /* WITH_PROFILE */
-
-	return 0;
-}
-
-
 static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *state)
 {
 	struct connections_data crec;
@@ -602,7 +246,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
  int main(int argc, char *argv[])
 {
 	int c;
-	static int profile_only = 0;
+	int profile_only = 0;
 	TDB_CONTEXT *tdb;
 	BOOL show_processes, show_locks, show_shares;
 	poptContext pc;
@@ -614,9 +258,8 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
 		{"shares",	'S', POPT_ARG_NONE,	&shares_only, 'S', "Show shares only" },
 		{"user", 	'u', POPT_ARG_STRING,	&username, 'u', "Switch to user" },
 		{"brief",	'b', POPT_ARG_NONE, 	&brief, 'b', "Be brief" },
-#ifdef WITH_PROFILE
-		{"profile",	'P', POPT_ARG_NONE,	&profile_only, 'P', "Do profiling" },
-#endif /* WITH_PROFILE */
+		{"profile",     'P', POPT_ARG_NONE, NULL, 'P', "Do profiling" },
+		{"profile-rates", 'R', POPT_ARG_NONE, NULL, 'R', "Show call rates" },
 		{"byterange",	'B', POPT_ARG_NONE,	&show_brl, 'B', "Include byte range locks"},
 		{"numeric",	'n', POPT_ARG_NONE,	&numeric_only, 'n', "Numeric uid/gid"},
 		POPT_COMMON_SAMBA
@@ -643,6 +286,9 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
 		case 'u':                                      
 			Ucrit_addUid(nametouid(poptGetOptArg(pc)));
 			break;
+		case 'P':
+		case 'R':
+			profile_only = c;
 		}
 	}
 
@@ -663,11 +309,18 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
 		fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
 		return (-1);
 	}
-	
-	if (profile_only) {
-		return profile_dump();
+
+	switch (profile_only) {
+		case 'P':
+			/* Dump profile data */
+			return status_profile_dump(verbose);
+		case 'R':
+			/* Continuously display rate-converted data */
+			return status_profile_rates(verbose);
+		default:
+			break;
 	}
-	
+
 	if ( show_processes ) {
 		tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 		if (!tdb) {
@@ -719,7 +372,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
 			exit(1);
 		}
 		
-		ret = share_mode_forall(print_share_mode);
+		ret = share_mode_forall(print_share_mode, NULL);
 
 		if (ret == 0) {
 			d_printf("No locked files\n");