[SCM] Samba Shared Repository - branch v4-14-stable updated

Karolin Seeger kseeger at samba.org
Tue Jun 1 07:25:13 UTC 2021


The branch, v4-14-stable has been updated
       via  852d0c036f0 VERSION: Disable GIT_SNAPSHOT for the 4.14.5 release.
       via  c237a2b610d WHATSNEW: Add release notes for Samba 4.14.5.
       via  e7e537d77cc s3: smbd: Fix uninitialized memory read in process_symlink_open() when used with vfs_shadow_copy2().
       via  a29ee1ff68c docs: Update list of available commands in rpcclient
       via  c91ea2d31b2 s3:rpcclient: Document command of witness protocol
       via  46cf8514c76 docs-xml: Update smbcacls manpage
       via  c58029aa274 smbd: correctly initialize close timestamp fields
       via  94ba90fa755 torture: add a test that verifies SMB2 close fields without postqueryattrib
       via  1780305b193 ctdb: Fix a crash in run_proc_signal_handler()
       via  477da04a550 ctdb: Introduce output before and after the 10-second timeout
       via  95966b17f23 ctdb: Wait for SIGCHLD if script timed out
       via  a41f3fd29fe ctdb: Introduce a helper variable in run_event_test.c
       via  d700005983a ctdb: Call run_event_recv() in a callback function
       via  ee9fbada695 ctdb: fix typos
       via  42726c3f665 s3: smbd: Ensure POSIX default ACL is mapped into returned Windows ACL for directory handles.
       via  5611a6999c0 lib:replace: Do not build strndup test with gcc 11 or newer
       via  a18d6bdaa54 Fix gcc11 compiler issue "-Werror=stringop-overflow="
       via  657a1edd1b7 Fix gcc11 compiler issue "-Werror=maybe-uninitialized"
       via  0ce7c5e7a62 s3: smbd: SMB1 SMBsplwr doesn't send a reply packet on success.
       via  1c4e89f0e32 s3:winbind: For 'security = ADS' require realm/workgroup to be set
       via  edf1b31ea82 s3:utils: Tell users that workgroup/realm is required for ADS mode
       via  7db0a50a8f8 docs: Expand the "log level" docs on audit logging
       via  cc4e8ec610b docs: underline special words in the audit logging part of "log level" in man smb.conf
       via  ecfca707d5f docs: Further discourage the use of the "event notification" options
       via  54ef0e6d6bb docs: Add proper explination on why transactions need to be audited.
       via  990997cae28 docs: Add missing documentation on dsdb_group_audit and dsdb_group_audit_json
       via  60527b07cbd debug: Synchronise "log level" in smb.conf with the code
       via  c650f7738bf VERSION: Bump version up to 4.14.5.
       via  73195193503 Merge tag 'samba-4.14.4' into v4-14-test
       via  a8b9ea7e1aa VERSION: Bump version up to 4.14.4...
      from  e29fc62e1d6 VERSION: Disable GIT_SNAPSHOT for the 4.14.4 release.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-14-stable


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                                            |   2 +-
 WHATSNEW.txt                                       |  68 +++-
 ctdb/common/run_proc.c                             |   6 +-
 ctdb/tests/UNIT/cunit/run_event_001.sh             |   3 +
 ctdb/tests/src/run_event_test.c                    |  52 ++-
 docs-xml/manpages/rpcclient.1.xml                  | 377 ++++++++++++++-------
 docs-xml/manpages/smbcacls.1.xml                   |  22 ++
 docs-xml/smbdotconf/logging/loglevel.xml           | 108 ++++--
 .../smbdotconf/logon/autheventnotification.xml     |  17 +-
 docs-xml/smbdotconf/misc/dsdbeventnotification.xml |  14 +-
 .../misc/dsdbgroupchangenotification.xml           |  16 +-
 .../misc/dsdbpasswordeventnotification.xml         |  16 +-
 lib/replace/tests/testsuite.c                      |  13 +
 libcli/auth/smbencrypt.c                           |   2 +-
 source3/rpc_client/cli_samr.c                      |   4 +-
 source3/rpcclient/cmd_spotlight.c                  |   2 +-
 source3/rpcclient/cmd_witness.c                    |  10 +-
 source3/smbd/open.c                                |  15 +-
 source3/smbd/posix_acls.c                          |  12 +-
 source3/smbd/reply.c                               |   2 +
 source3/smbd/smb2_close.c                          |   8 +-
 source3/utils/testparm.c                           |  22 ++
 source3/winbindd/winbindd.c                        |  17 +
 source3/winbindd/winbindd_creds.c                  |   4 +-
 source3/winbindd/winbindd_proto.h                  |   4 +-
 source4/dsdb/common/util_links.c                   |   2 +-
 source4/torture/rpc/samr.c                         |   8 +-
 source4/torture/smb2/timestamps.c                  |  65 ++++
 28 files changed, 666 insertions(+), 225 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 4b9426fa79b..45b88aa82a8 100644
--- a/VERSION
+++ b/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=4
 SAMBA_VERSION_MINOR=14
-SAMBA_VERSION_RELEASE=4
+SAMBA_VERSION_RELEASE=5
 
 ########################################################
 # If a official release has a serious bug              #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 8fa0ee3caf1..7a1af731a94 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,3 +1,68 @@
+                   ==============================
+                   Release Notes for Samba 4.14.5
+                            June 01, 2021
+                   ==============================
+
+
+This is the latest stable release of the Samba 4.14 release series.
+
+
+Changes since 4.14.4
+--------------------
+
+o  Jeremy Allison <jra at samba.org>
+   * BUG 14696: s3: smbd: SMB1 SMBsplwr doesn't send a reply packet on success.
+   * BUG 14708: s3: smbd: Ensure POSIX default ACL is mapped into returned
+     Windows ACL for directory handles.
+   * BUG 14721: s3: smbd: Fix uninitialized memory read in
+     process_symlink_open() when used with vfs_shadow_copy2().
+
+o  Andrew Bartlett <abartlet at samba.org>
+   * BUG 14689: docs: Expand the "log level" docs on audit logging.
+
+o  Ralph Boehme <slow at samba.org>
+   * BUG 14714: smbd: Correctly initialize close timestamp fields.
+
+o  Günther Deschner <gd at samba.org>
+   * BUG 14699: Fix gcc11 compiler issues.
+
+o  Pavel Filipenský <pfilipen at redhat.com>
+   * BUG 14718: docs-xml: Update smbcacls manpage.
+   * BUG 14719: docs: Update list of available commands in rpcclient.
+
+o  Volker Lendecke <vl at samba.org>
+   * BUG 14475: ctdb: Fix a crash in run_proc_signal_handler().
+
+o  Andreas Schneider <asn at samba.org>
+   * BUG 14695: s3:winbind: For 'security = ADS' require realm/workgroup to be
+     set.
+   * BUG 14699: lib:replace: Do not build strndup test with gcc 11 or newer.
+
+
+#######################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 4.1 and newer product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
+
+
                    ==============================
                    Release Notes for Samba 4.14.4
                            April 29, 2021
@@ -59,8 +124,7 @@ database (https://bugzilla.samba.org/).
 ======================================================================
 
 
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
 
 
                    ==============================
diff --git a/ctdb/common/run_proc.c b/ctdb/common/run_proc.c
index 0c3c1de72fe..d55af6c3a1e 100644
--- a/ctdb/common/run_proc.c
+++ b/ctdb/common/run_proc.c
@@ -426,7 +426,7 @@ static void run_proc_done(struct tevent_req *req)
 
 	state->result = state->proc->result;
 	if (state->proc->output != NULL) {
-		state->output = talloc_steal(state, state->proc->output);
+		state->output = talloc_move(state, &state->proc->output);
 	}
 	talloc_steal(state, state->proc);
 
@@ -464,7 +464,7 @@ static void run_proc_timedout(struct tevent_req *subreq)
 
 	state->result.err = ETIMEDOUT;
 	if (state->proc->output != NULL) {
-		state->output = talloc_steal(state, state->proc->output);
+		state->output = talloc_move(state, &state->proc->output);
 	}
 	state->pid = state->proc->pid;
 
@@ -495,7 +495,7 @@ bool run_proc_recv(struct tevent_req *req, int *perr,
 	}
 
 	if (output != NULL) {
-		*output = talloc_steal(mem_ctx, state->output);
+		*output = talloc_move(mem_ctx, &state->output);
 	}
 
 	return true;
diff --git a/ctdb/tests/UNIT/cunit/run_event_001.sh b/ctdb/tests/UNIT/cunit/run_event_001.sh
index 50051bfaab2..4df3b4bdad6 100755
--- a/ctdb/tests/UNIT/cunit/run_event_001.sh
+++ b/ctdb/tests/UNIT/cunit/run_event_001.sh
@@ -113,7 +113,9 @@ unit_test run_event_test "$scriptdir" run 10 monitor
 cat > "$scriptdir/22.bar.script" <<EOF
 #!/bin/sh
 
+echo before sleep
 sleep 10
+echo after sleep
 EOF
 
 # Timed out script
@@ -124,6 +126,7 @@ unit_test run_event_test "$scriptdir" enable 22.bar
 
 ok <<EOF
 11.foo: hello
+22.bar: before sleep
 Event monitor completed with result=-$(errcode ETIMEDOUT)
 11.foo result=0
 22.bar result=-$(errcode ETIMEDOUT)
diff --git a/ctdb/tests/src/run_event_test.c b/ctdb/tests/src/run_event_test.c
index cfe5f161d1d..94548647014 100644
--- a/ctdb/tests/src/run_event_test.c
+++ b/ctdb/tests/src/run_event_test.c
@@ -52,6 +52,19 @@ static char *compact_args(const char **argv, int argc, int from)
 	return arg_str;
 }
 
+static void run_done(struct tevent_req *req)
+{
+	struct run_event_script_list **script_list =
+		tevent_req_callback_data_void(req);
+	bool status;
+	int ret;
+
+	status = run_event_recv(req, &ret, NULL, script_list);
+	if (!status) {
+		fprintf(stderr, "run_event_recv() failed, ret=%d\n", ret);
+	}
+}
+
 static void do_run(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 		   struct run_event_context *run_ctx,
 		   int argc, const char **argv)
@@ -61,8 +74,8 @@ static void do_run(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 	struct run_event_script_list *script_list = NULL;
 	char *arg_str;
 	unsigned int i;
-	int ret, t;
-	bool status;
+	int t;
+	bool wait_for_signal = false;
 
 	if (argc < 5) {
 		usage(argv[0]);
@@ -86,17 +99,13 @@ static void do_run(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 			     timeout,
 			     false);
 	if (req == NULL) {
-		fprintf(stderr, "run_proc_send() failed\n");
+		fprintf(stderr, "run_event_send() failed\n");
 		return;
 	}
 
-	tevent_req_poll(req, ev);
+	tevent_req_set_callback(req, run_done, &script_list);
 
-	status = run_event_recv(req, &ret, mem_ctx, &script_list);
-	if (! status) {
-		fprintf(stderr, "run_proc_recv() failed, ret=%d\n", ret);
-		return;
-	}
+	tevent_req_poll(req, ev);
 
 	if (script_list == NULL || script_list->num_scripts == 0) {
 		printf("No event scripts found\n");
@@ -106,9 +115,30 @@ static void do_run(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 	printf("Event %s completed with result=%d\n",
 	       argv[4], script_list->summary);
 	for (i=0; i<script_list->num_scripts; i++) {
-		printf("%s result=%d\n", script_list->script[i].name,
-		       script_list->script[i].summary);
+		struct run_event_script *s = &script_list->script[i];
+		printf("%s result=%d\n", s->name, s->summary);
+
+		if (s->summary == -ETIMEDOUT) {
+			wait_for_signal = true;
+		}
+	}
+
+	TALLOC_FREE(script_list);
+	TALLOC_FREE(req);
+
+	if (!wait_for_signal) {
+		return;
 	}
+
+	req = tevent_wakeup_send(
+		ev, ev, tevent_timeval_current_ofs(10, 0));
+	if (req == NULL) {
+		fprintf(stderr, "Could not wait for signal\n");
+		return;
+	}
+
+	tevent_req_poll(req, ev);
+	TALLOC_FREE(req);
 }
 
 static void do_list(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
diff --git a/docs-xml/manpages/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml
index 18f9c14b09e..ae658647b81 100644
--- a/docs-xml/manpages/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
@@ -167,75 +167,76 @@
 
 	<refsect2>
 	<title>LSARPC</title>
-
 	<variablelist>
 		<varlistentry><term>lsaquery</term><listitem><para>Query info policy</para></listitem></varlistentry>
-		
-		<varlistentry><term>lookupsids</term><listitem><para>Resolve a list 
-		of SIDs to usernames.
-		</para></listitem></varlistentry>
-		
-		<varlistentry><term>lookupnames</term><listitem><para>Resolve a list 
-		of usernames to SIDs.
-		</para></listitem></varlistentry>
-		
+		<varlistentry><term>lookupsids</term><listitem><para>Convert SIDs to names</para></listitem></varlistentry>
+		<varlistentry><term>lookupsids3</term><listitem><para>Convert SIDs to names</para></listitem></varlistentry>
+		<varlistentry><term>lookupsids_level</term><listitem><para>Convert SIDs to names</para></listitem></varlistentry>
+		<varlistentry><term>lookupnames</term><listitem><para>Convert names to SIDs</para></listitem></varlistentry>
+		<varlistentry><term>lookupnames4</term><listitem><para>Convert names to SIDs</para></listitem></varlistentry>
+		<varlistentry><term>lookupnames_level</term><listitem><para>Convert names to SIDs</para></listitem></varlistentry>
 		<varlistentry><term>enumtrust</term><listitem><para>Enumerate trusted domains</para></listitem></varlistentry>
-
 		<varlistentry><term>enumprivs</term><listitem><para>Enumerate privileges</para></listitem></varlistentry>
-
 		<varlistentry><term>getdispname</term><listitem><para>Get the privilege name</para></listitem></varlistentry>
-
 		<varlistentry><term>lsaenumsid</term><listitem><para>Enumerate the LSA SIDS</para></listitem></varlistentry>
-
+		<varlistentry><term>lsacreateaccount</term><listitem><para>Create a new lsa account</para></listitem></varlistentry>
 		<varlistentry><term>lsaenumprivsaccount</term><listitem><para>Enumerate the privileges of an SID</para></listitem></varlistentry>
-
 		<varlistentry><term>lsaenumacctrights</term><listitem><para>Enumerate the rights of an SID</para></listitem></varlistentry>
-
-		<varlistentry><term>lsaenumacctwithright</term><listitem><para>Enumerate accounts with a right</para></listitem></varlistentry>
-
+		<varlistentry><term>lsaaddpriv</term><listitem><para>Assign a privilege to a SID</para></listitem></varlistentry>
+		<varlistentry><term>lsadelpriv</term><listitem><para>Revoke a privilege from a SID</para></listitem></varlistentry>
 		<varlistentry><term>lsaaddacctrights</term><listitem><para>Add rights to an account</para></listitem></varlistentry>
-
 		<varlistentry><term>lsaremoveacctrights</term><listitem><para>Remove rights from an account</para></listitem></varlistentry>
-
 		<varlistentry><term>lsalookupprivvalue</term><listitem><para>Get a privilege value given its name</para></listitem></varlistentry>
-
 		<varlistentry><term>lsaquerysecobj</term><listitem><para>Query LSA security object</para></listitem></varlistentry>
-
-	</variablelist>	
+		<varlistentry><term>lsaquerytrustdominfo</term><listitem><para>Query LSA trusted domains info (given a SID)</para></listitem></varlistentry>
+		<varlistentry><term>lsaquerytrustdominfobyname</term><listitem><para>Query LSA trusted domains info (given a name), only works for Windows > 2k</para></listitem></varlistentry>
+		<varlistentry><term>lsaquerytrustdominfobysid</term><listitem><para>Query LSA trusted domains info (given a SID)</para></listitem></varlistentry>
+		<varlistentry><term>lsasettrustdominfo</term><listitem><para>Set LSA trusted domain info</para></listitem></varlistentry>
+		<varlistentry><term>getusername</term><listitem><para>Get username</para></listitem></varlistentry>
+		<varlistentry><term>createsecret</term><listitem><para>Create Secret</para></listitem></varlistentry>
+		<varlistentry><term>deletesecret</term><listitem><para>Delete Secret</para></listitem></varlistentry>
+		<varlistentry><term>querysecret</term><listitem><para>Query Secret</para></listitem></varlistentry>
+		<varlistentry><term>setsecret</term><listitem><para>Set Secret</para></listitem></varlistentry>
+		<varlistentry><term>retrieveprivatedata</term><listitem><para>Retrieve Private Data</para></listitem></varlistentry>
+		<varlistentry><term>storeprivatedata</term><listitem><para>Store Private Data</para></listitem></varlistentry>
+		<varlistentry><term>createtrustdom</term><listitem><para>Create Trusted Domain</para></listitem></varlistentry>
+		<varlistentry><term>deletetrustdom</term><listitem><para>Delete Trusted Domain</para></listitem></varlistentry>
+	</variablelist>
 	</refsect2>
-	
+
+
 	<refsect2>
 	<title>LSARPC-DS</title>
-	
 	<variablelist>
 		<varlistentry><term>dsroledominfo</term><listitem><para>Get Primary Domain Information</para></listitem></varlistentry>
 	</variablelist>
+	</refsect2>
 
-	<para> </para>
 
-	<para><emphasis>DFS</emphasis></para>
+	<refsect2>
+	<title>DFS</title>
 	<variablelist>
-		<varlistentry><term>dfsexist</term><listitem><para>Query DFS support</para></listitem></varlistentry>
+		<varlistentry><term>dfsversion</term><listitem><para>Query DFS support</para></listitem></varlistentry>
 		<varlistentry><term>dfsadd</term><listitem><para>Add a DFS share</para></listitem></varlistentry>
 		<varlistentry><term>dfsremove</term><listitem><para>Remove a DFS share</para></listitem></varlistentry>
 		<varlistentry><term>dfsgetinfo</term><listitem><para>Query DFS share info</para></listitem></varlistentry>
 		<varlistentry><term>dfsenum</term><listitem><para>Enumerate dfs shares</para></listitem></varlistentry>
+		<varlistentry><term>dfsenumex</term><listitem><para>Enumerate dfs shares</para></listitem></varlistentry>
 	</variablelist>
-
 	</refsect2>
 
+
 	<refsect2>
-	<title>REG</title>
+	<title>SHUTDOWN</title>
 	<variablelist>
-		<varlistentry><term>shutdown</term><listitem><para>Remote Shutdown</para></listitem></varlistentry>
-		<varlistentry><term>abortshutdown</term><listitem><para>Abort Shutdown</para></listitem></varlistentry>
+		<varlistentry><term>shutdowninit</term><listitem><para>syntax: shutdown [-m message] </para></listitem></varlistentry>
+		<varlistentry><term>shutdownabort</term><listitem><para>syntax: shutdownabort</para></listitem></varlistentry>
 	</variablelist>
-
 	</refsect2>
 
+
 	<refsect2>
 	<title>SRVSVC</title>
-
 	<variablelist>
 		<varlistentry><term>srvinfo</term><listitem><para>Server query info</para></listitem></varlistentry>
 		<varlistentry><term>netshareenum</term><listitem><para>Enumerate shares</para></listitem></varlistentry>
@@ -254,34 +255,49 @@
 		<varlistentry><term>netshareadd</term><listitem><para>Add share</para></listitem></varlistentry>
 		<varlistentry><term>netsharedel</term><listitem><para>Delete share</para></listitem></varlistentry>
 	</variablelist>
-
 	</refsect2>
 
+
 	<refsect2>
 	<title>SAMR</title>
-
 	<variablelist>
 		<varlistentry><term>queryuser</term><listitem><para>Query user info</para></listitem></varlistentry>
 		<varlistentry><term>querygroup</term><listitem><para>Query group info</para></listitem></varlistentry>
 		<varlistentry><term>queryusergroups</term><listitem><para>Query user groups</para></listitem></varlistentry>
+		<varlistentry><term>queryuseraliases</term><listitem><para>Query user aliases</para></listitem></varlistentry>
 		<varlistentry><term>querygroupmem</term><listitem><para>Query group membership</para></listitem></varlistentry>
 		<varlistentry><term>queryaliasmem</term><listitem><para>Query alias membership</para></listitem></varlistentry>
+		<varlistentry><term>queryaliasinfo</term><listitem><para>Query alias info</para></listitem></varlistentry>
+		<varlistentry><term>deletealias</term><listitem><para>Delete an alias</para></listitem></varlistentry>
 		<varlistentry><term>querydispinfo</term><listitem><para>Query display info</para></listitem></varlistentry>
+		<varlistentry><term>querydispinfo2</term><listitem><para>Query display info</para></listitem></varlistentry>
+		<varlistentry><term>querydispinfo3</term><listitem><para>Query display info</para></listitem></varlistentry>
 		<varlistentry><term>querydominfo</term><listitem><para>Query domain info</para></listitem></varlistentry>
 		<varlistentry><term>enumdomusers</term><listitem><para>Enumerate domain users</para></listitem></varlistentry>
 		<varlistentry><term>enumdomgroups</term><listitem><para>Enumerate domain groups</para></listitem></varlistentry>
 		<varlistentry><term>enumalsgroups</term><listitem><para>Enumerate alias groups</para></listitem></varlistentry>
+		<varlistentry><term>enumdomains</term><listitem><para>Enumerate domains</para></listitem></varlistentry>
 		<varlistentry><term>createdomuser</term><listitem><para>Create domain user</para></listitem></varlistentry>
+		<varlistentry><term>createdomgroup</term><listitem><para>Create domain group</para></listitem></varlistentry>
+		<varlistentry><term>createdomalias</term><listitem><para>Create domain alias</para></listitem></varlistentry>
 		<varlistentry><term>samlookupnames</term><listitem><para>Look up names</para></listitem></varlistentry>
 		<varlistentry><term>samlookuprids</term><listitem><para>Look up names</para></listitem></varlistentry>
+		<varlistentry><term>deletedomgroup</term><listitem><para>Delete domain group</para></listitem></varlistentry>
 		<varlistentry><term>deletedomuser</term><listitem><para>Delete domain user</para></listitem></varlistentry>
 		<varlistentry><term>samquerysecobj</term><listitem><para>Query SAMR security object</para></listitem></varlistentry>
 		<varlistentry><term>getdompwinfo</term><listitem><para>Retrieve domain password info</para></listitem></varlistentry>
-		<varlistentry><term>lookupdomain</term><listitem><para>Look up domain</para></listitem></varlistentry>
+		<varlistentry><term>getusrdompwinfo</term><listitem><para>Retrieve user domain password info</para></listitem></varlistentry>
+		<varlistentry><term>lookupdomain</term><listitem><para>Lookup Domain Name</para></listitem></varlistentry>
+		<varlistentry><term>chgpasswd</term><listitem><para>Change user password</para></listitem></varlistentry>
+		<varlistentry><term>chgpasswd2</term><listitem><para>Change user password</para></listitem></varlistentry>
+		<varlistentry><term>chgpasswd3</term><listitem><para>Change user password</para></listitem></varlistentry>
+		<varlistentry><term>getdispinfoidx</term><listitem><para>Get Display Information Index</para></listitem></varlistentry>
+		<varlistentry><term>setuserinfo</term><listitem><para>Set user info</para></listitem></varlistentry>
+		<varlistentry><term>setuserinfo2</term><listitem><para>Set user info2</para></listitem></varlistentry>
 	</variablelist>
-
 	</refsect2>
 
+
 	<refsect2>
 	<title>SPOOLSS</title>
 
@@ -322,7 +338,7 @@ Comma Separated list of Files
 		default driver version for the specified architecture will
 		be used.  This option can be used to upload Windows 2000
 		(version 3) printer drivers.</para></listitem></varlistentry>
-	
+
 		<varlistentry><term>addprinter <printername> 
 		<sharename> <drivername> <port></term>
 		<listitem><para>
@@ -333,7 +349,6 @@ Comma Separated list of Files
 		<command>enumports</command>.</para>
 		</listitem></varlistentry>
 
-
 		<varlistentry><term>deldriver <driver></term><listitem><para>Delete the
 		specified printer driver for all architectures.  This
 		does not delete the actual driver files from the server,
@@ -358,22 +373,23 @@ Comma Separated list of Files
 
 		<varlistentry><term>enumdataex</term><listitem><para>Enumerate printer data for a key</para></listitem></varlistentry>
 
+		<varlistentry><term>enumkey</term><listitem><para>Enumerate printer keys</para></listitem></varlistentry>
+
 		<varlistentry><term>enumjobs <printer></term>
 		<listitem><para>List the jobs and status of a given printer. 
 		This command corresponds to the MS Platform SDK EnumJobs() 
 		function</para></listitem></varlistentry>
 
-		<varlistentry><term>enumkey</term><listitem><para>Enumerate
-		printer keys</para></listitem></varlistentry>
-		
+		<varlistentry><term>getjob</term><listitem><para>Get print job</para></listitem></varlistentry>
+		<varlistentry><term>setjob</term><listitem><para>Set print job</para></listitem></varlistentry>
+
+
 		<varlistentry><term>enumports [level]</term>
 		<listitem><para>
 		Executes an EnumPorts() call using the specified 
 		info level. Currently only info levels 1 and 2 are supported. 
 		</para></listitem></varlistentry>
 
-
-
 		<varlistentry><term>enumdrivers [level]</term> 
 		<listitem><para>
 		Execute an EnumPrinterDrivers() call.  This lists the various installed 
@@ -381,17 +397,12 @@ Comma Separated list of Files
 		documentation for more details of the various flags and calling 
 		options. Currently supported info levels are 1, 2, and 3.</para></listitem></varlistentry>
 
-
-
 		<varlistentry><term>enumprinters [level]</term>
 		<listitem><para>Execute an EnumPrinters() call.  This lists the various installed 
 		and share printers.  Refer to the MS Platform SDK documentation for 
 		more details of the various flags and calling options. Currently
 		supported info levels are 1, 2 and 5.</para></listitem></varlistentry>
 
-
-
-
 		<varlistentry><term>getdata <printername> <valuename;></term> 
 		<listitem><para>Retrieve the data for a given printer setting.  See 
 		the  <command>enumdata</command> command for more information.  
@@ -410,7 +421,6 @@ Comma Separated list of Files
 		the given printer. This command corresponds to the GetPrinterDriver()
 		MS Platform  SDK function. Currently info level 1, 2, and 3 are supported.
 		</para></listitem></varlistentry>
-	
 
 		<varlistentry><term>getdriverdir <arch></term>
 		<listitem><para>
@@ -421,21 +431,22 @@ Comma Separated list of Files
 		(for Windows 95/98), "Windows NT x86", "Windows NT PowerPC", "Windows
 		Alpha_AXP", and "Windows NT R4000". </para></listitem></varlistentry>
 
-
+		<varlistentry><term>getdriverpackagepath</term>
+		<listitem><para>Get print driver package download directory</para></listitem></varlistentry>
 
 		<varlistentry><term>getprinter <printername></term> 
 		<listitem><para>Retrieve the current printer information.  This command 
 		corresponds to the GetPrinter() MS Platform SDK function. 
 		</para></listitem></varlistentry>
 
-		<varlistentry><term>getprintprocdir</term><listitem><para>Get
-		print processor
-		directory</para></listitem></varlistentry>
-		
+
 		<varlistentry><term>openprinter <printername></term> 
 		<listitem><para>Execute an OpenPrinterEx() and ClosePrinter() RPC 
 		against a given printer. </para></listitem></varlistentry>


-- 
Samba Shared Repository



More information about the samba-cvs mailing list