The branch, master has been updated
via 189b3d9 docs-xml: fix default name resolve order (fix bug #7564)
via 9a68a98 docs: remove whitespace in example samba.ldif (fix bug
#8789)
via 35c1162 docs: add reload-printers command to smbcontrol manual page
via 7ff42f3 s3-utils: add do_reload_printers command to smbcontol
from 6aa12fc build: Remove SMB_OFF_T, replace with off_t
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 189b3d9b24bf553ff7096397c389f20ba99e0dfa
Author: Björn Baumbach <b...@sernet.de>
Date: Wed Apr 4 16:58:24 2012 +0200
docs-xml: fix default name resolve order (fix bug #7564)
Autobuild-User: Volker Lendecke <v...@samba.org>
Autobuild-Date: Fri Apr 6 09:54:37 CEST 2012 on sn-devel-104
commit 9a68a98e87e5597ba684bea3d5e6a44951e51973
Author: Björn Baumbach <b...@sernet.de>
Date: Wed Apr 4 16:41:35 2012 +0200
docs: remove whitespace in example samba.ldif (fix bug #8789)
commit 35c11621c9de48d7c98e2dd54a43128be467f2e8
Author: Björn Baumbach <b...@sernet.de>
Date: Tue Jan 17 12:31:17 2012 +0100
docs: add reload-printers command to smbcontrol manual page
commit 7ff42f3746c88ee999ec1e87b31c741bce016576
Author: Björn Baumbach <b...@sernet.de>
Date: Tue Jan 10 16:59:38 2012 +0100
s3-utils: add do_reload_printers command to smbcontol
Add command to force smbd to reload printers by sending MSG_PRINTER_PCAP.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/smbcontrol.1.xml | 7 +++++++
docs-xml/smbdotconf/protocol/nameresolveorder.xml | 2 +-
examples/LDAP/samba.ldif | 2 +-
source3/utils/smbcontrol.c | 14 ++++++++++++++
4 files changed, 23 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml
b/docs-xml/manpages-3/smbcontrol.1.xml
index f83376b..f764246 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -261,6 +261,13 @@
</varlistentry>
<varlistentry>
+ <term>reload-printers</term>
+ <listitem><para>Force smbd to reload printers. Can only be sent to
+ <constant>smbd</constant>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>idmap</term>
<listitem><para>Notify about changes of id mapping. Can be sent
to <constant>smbd</constant> or (not implemented yet)
<constant>winbindd</constant>.
diff --git a/docs-xml/smbdotconf/protocol/nameresolveorder.xml
b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
index 9b1ad07..662c3fb 100644
--- a/docs-xml/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
@@ -65,6 +65,6 @@
</description>
-<value type="default">lmhosts host wins bcast</value>
+<value type="default">lmhosts wins host bcast</value>
<value type="example">lmhosts bcast host</value>
</samba:parameter>
diff --git a/examples/LDAP/samba.ldif b/examples/LDAP/samba.ldif
index be6433c..5106e5f 100644
--- a/examples/LDAP/samba.ldif
+++ b/examples/LDAP/samba.ldif
@@ -153,7 +153,7 @@ olcAttributeTypes: {49}( 1.3.6.1.4.1.7165.2.1.72 NAME
'sambaTrustDirection' DE
21.1.27 SINGLE-VALUE )
olcAttributeTypes: {50}( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' DESC
'Fully qualified name of the domain with which a trust exists' EQUALITY case
- IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
+ IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
olcAttributeTypes: {51}( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' DESC 'Ne
tBIOS name of a domain' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.
121.1.15{128} )
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 5699f23..7d7eb12 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1192,6 +1192,19 @@ static bool do_reload_config(struct tevent_context
*ev_ctx,
return send_message(msg_ctx, pid, MSG_SMB_CONF_UPDATED, NULL, 0);
}
+static bool do_reload_printers(struct tevent_context *ev_ctx,
+ struct messaging_context *msg_ctx,
+ const struct server_id pid,
+ const int argc, const char **argv)
+{
+ if (argc != 1) {
+ fprintf(stderr, "Usage: smbcontrol <dest> reload-printers\n");
+ return False;
+ }
+
+ return send_message(msg_ctx, pid, MSG_PRINTER_PCAP, NULL, 0);
+}
+
static void my_make_nmb_name( struct nmb_name *n, const char *name, int type)
{
fstring unix_name;
@@ -1274,6 +1287,7 @@ static const struct {
{ "shutdown", do_shutdown, "Shut down daemon" },
{ "drvupgrade", do_drvupgrade, "Notify a printer driver has changed" },
{ "reload-config", do_reload_config, "Force smbd or winbindd to reload
config file"},
+ { "reload-printers", do_reload_printers, "Force smbd to reload
printers"},
{ "nodestatus", do_nodestatus, "Ask nmbd to do a node status request"},
{ "online", do_winbind_online, "Ask winbind to go into online state"},
{ "offline", do_winbind_offline, "Ask winbind to go into offline
state"},
--
Samba Shared Repository
