summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/docbook/docbook.txt101
-rw-r--r--docs/htmldocs/smbclient.1.html1
-rw-r--r--docs/manpages/smbclient.15
-rw-r--r--docs/yodldocs/smbclient.1.yo3
-rwxr-xr-xsource/configure.developer2
-rw-r--r--source/printing/nt_printing.c94
-rw-r--r--testsuite/printing/psec.c6
7 files changed, 110 insertions, 102 deletions
diff --git a/docs/docbook/docbook.txt b/docs/docbook/docbook.txt
index a69cf0ff9dd..37cad901093 100644
--- a/docs/docbook/docbook.txt
+++ b/docs/docbook/docbook.txt
@@ -3,47 +3,53 @@ What are DocBook documents doing in the Samba Distribution ?
By David Bannon, D.Bannon@latrobe.edu.au November, 2000
----------------------------------------------------------
-We are planning to convert some or all (?) of the samba docs to sgml DocBook to
-make them easier to maintain and produce a nicer looking product.
+We are planning to convert some or all (?) of the samba docs to sgml
+DocBook to make them easier to maintain and produce a nicer looking
+product.
-This short note (strange isn’t it how it always starts out as a short note and becomes a
-long one ?) will explain very briefly how and why we are doing this.
+This short note (strange isn’t it how it always starts out as a short note
+and becomes a long one ?) will explain very briefly how and why we are
+doing this.
-The format.
---------------
+The format
+----------
-If you are new to sgml, regard an sgml file as 'source code'. You don't read it
-directly, use it to create other formats (like the txt and html included in ../txt and
-../html).
+If you are new to sgml, regard an sgml file as 'source code'. You don't
+read it directly, use it to create other formats (like the txt and html
+included in ../txt and ../html).
-Docbook is a particular sgml style, particularly suited to producing technical manuals.
-In the two documents I have produced so far I have used DocBook 4.1, it seems that
-products like RedHat Linux is still include only version 3.1, the differences are
-minor. The Linux Documentation Project is using a modified version of 3.1 but are
-really geared up to make multi paged documents, something we want to avoid for
-logistic reasons.
+Docbook is a particular sgml style, particularly suited to producing
+technical manuals. In the two documents I have produced so far I have used
+DocBook 4.1, it seems that products like RedHat Linux is still include only
+version 3.1, the differences are minor. The Linux Documentation Project is
+using a modified version of 3.1 but are really geared up to make multi
+paged documents, something we want to avoid for logistic reasons.
The Output
---------------
-Formatted html or xml is easily produced from a DocBook document, however I
-had difficulty making a txt file directly ! It appears that the people who make
-DocBook did not imagine anyone wanting to make plain text from a DocBook
-document. At least one set of sgml tools appears to have decided that the easiest way
-is to make the html and then convert that, this works fine.
+----------
-I have not had the need to make man pages from a DocBook document yet, anyone
-want to send me some pointers ??
+Formatted html or xml is easily produced from a DocBook document, however I
+had difficulty making a txt file directly ! It appears that the people who
+make DocBook did not imagine anyone wanting to make plain text from a
+DocBook document. At least one set of sgml tools appears to have decided
+that the easiest way is to make the html and then convert that, this works
+fine.
-To make file handling and distribution easy I have opted for a single file or page per
-document. In the Samba 2.2 distribution I made an html and a txt version of each sgml
-file and placed that in the appropriate directory under ~/doc.
+I have not had the need to make man pages from a DocBook document yet,
+anyone want to send me some pointers ??
+
+To make file handling and distribution easy I have opted for a single file
+or page per document. In the Samba 2.2 distribution I made an html and a
+txt version of each sgml file and placed that in the appropriate directory
+under ~/doc.
The Tools
--------------
+---------
-Any sgml document needs to be referred to a suitable style sheet (describing syntax)
-and other sheets that tell the translating programmes how to do the translations. The
-list of necessary ‘include’ files is a bit messy but once installed is pretty easy.
+Any sgml document needs to be referred to a suitable style sheet
+(describing syntax) and other sheets that tell the translating programmes
+how to do the translations. The list of necessary 'include’ files is a
+bit messy but once installed is pretty easy.
On one of my RedHat 6.2 systems I installed the following:
* sgml-common (as an rpm)
@@ -53,17 +59,17 @@ On one of my RedHat 6.2 systems I installed the following:
* Docbook 4.1 from http://docbook.org
* DSSSL 157 from http://nwalsh.com/docbook/dsssl/
-If you would be happy using DocBook 3.1 (and why not ?) then stop after the four
-rpms. If you want to use 4.1 and the current DSSSL then you will need a bit of
-manual editing of the catalog files.
+If you would be happy using DocBook 3.1 (and why not ?) then stop after the
+four rpms. If you want to use 4.1 and the current DSSSL then you will need
+a bit of manual editing of the catalog files.
-There are several downloadable descriptions of the DocBook syntax at the web sites
-mentioned above. Note that a lot of the docs only talk about version 3.1 with 4.1 as an
-add-on.
+There are several downloadable descriptions of the DocBook syntax at the
+web sites mentioned above. Note that a lot of the docs only talk about
+version 3.1 with 4.1 as an add-on.
-In either case you will need to include in the html/docbook.dsl and most likely a
-couple of ‘defines’ to achieve a suitable output. I made a local dsl file that I called
-html.dsl that looks like this :
+In either case you will need to include in the html/docbook.dsl and most
+likely a couple of 'defines’ to achieve a suitable output. I made a
+local dsl file that I called html.dsl that looks like this :
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
@@ -85,11 +91,11 @@ CDATA DSSSL>
<external-specification id="docbook" document="dbstyle">
</style-sheet>
-Note the top block that refers to where the dsssl-157 style sheets are installed, if you
-don’t put them there make sure you edit the file.
+Note the top block that refers to where the dsssl-157 style sheets are
+installed, if you don’t put them there make sure you edit the file.
-To use this stylesheet, have it in your working directory along with your sgml files.
-Jade does the actual conversion to html, call it like this :
+To use this stylesheet, have it in your working directory along with your
+sgml files. Jade does the actual conversion to html, call it like this :
jade -t sgml -d html.dsl stuff.sgml
@@ -97,11 +103,8 @@ To create the text version run the html through lynx :
Lynx -dump -nolist stuff.html > stuff.txt
-These instructions are crude by might help someone get going. Please feel free to
-contact me if you have any questions or if you can correct any one of the many
-mistakes I must have made above.
+These instructions are crude by might help someone get going. Please feel
+free to contact me if you have any questions or if you can correct any one
+of the many mistakes I must have made above.
David
-
-
-
diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 69d29ab07cc..f0a6ced61b6 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -228,6 +228,7 @@ user <code>"fred"</code> with password <code>"secret"</code>, you would specify.
<p><br><code>-U fred%secret</code> <br>
<p><br>on the command line. Note that there are no spaces around the percent
symbol.
+<p><br>You can specify a domain name as part of the username by using a username of the form "DOMAIN/user" or "DOMAIN\user".
<p><br>If you specify the password as part of username then the <a href="smbclient.1.html#minusN"><strong>-N</strong></a> option
(suppress password prompt) is assumed.
<p><br>If you specify the password as a parameter <em>AND</em> as part of username
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 067701fb8d1..424f6a70b06 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -1,4 +1,4 @@
-.TH SMBCLIENT 1 "23 Nov 2000" "smbclient 2.2.0-alpha1"
+.TH "smbclient " "1" "23 Nov 2000" "smbclient 2.2.0-alpha1"
.PP
.SH "NAME"
smbclient \- ftp-like client to access SMB/CIFS resources on servers
@@ -259,6 +259,9 @@ to set the environment variable to be \f(CWUSER=username%password\fP so
that a password is not passed on the command line (where it may be
seen by the ps command)\&.
.IP
+You can specify a domain name as part of the username by using a
+username of the form "DOMAIN/user" or "DOMAIN\euser"\&.
+.IP
If the service you are connecting to requires a password, it can be
supplied using the \fB-U\fP option, by appending a percent symbol ("%")
then the password to username\&. For example, to attach to a service as
diff --git a/docs/yodldocs/smbclient.1.yo b/docs/yodldocs/smbclient.1.yo
index fd2c11a15c1..8b42f281ff9 100644
--- a/docs/yodldocs/smbclient.1.yo
+++ b/docs/yodldocs/smbclient.1.yo
@@ -263,6 +263,9 @@ to set the environment variable to be tt(USER=username%password) so
that a password is not passed on the command line (where it may be
seen by the ps command).
+You can specify a domain name as part of the username by using a
+username of the form "DOMAIN/user" or "DOMAIN\user".
+
If the service you are connecting to requires a password, it can be
supplied using the link(bf(-U))(minusU) option, by appending a percent symbol ("%")
then the password to username. For example, to attach to a service as
diff --git a/source/configure.developer b/source/configure.developer
index 07ce9fcf12a..c3856889ea1 100755
--- a/source/configure.developer
+++ b/source/configure.developer
@@ -1,4 +1,4 @@
#!/bin/sh
CFLAGS="-g -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -DDEBUG_PASSWORD -DDEVELOPER"
export CFLAGS
-./configure $*
+`dirname $0`/configure $*
diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index 5a96405ee3b..b3b942d2ed2 100644
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -658,14 +658,12 @@ uint32 clean_up_driver_struct(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract,
NT_PRINTER_DRIVER_INFO_LEVEL_3 *driver;
driver=driver_abstract.info_3;
return clean_up_driver_struct_level_3(driver, user);
- break;
}
case 6:
{
NT_PRINTER_DRIVER_INFO_LEVEL_6 *driver;
driver=driver_abstract.info_6;
return clean_up_driver_struct_level_6(driver, user);
- break;
}
default:
return ERROR_INVALID_PARAMETER;
@@ -1543,7 +1541,7 @@ debugging function, dump at level 6 the struct in the logs
****************************************************************************/
static uint32 dump_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
{
- uint32 success;
+ uint32 result;
NT_PRINTER_DRIVER_INFO_LEVEL_3 *info3;
int i;
@@ -1554,7 +1552,7 @@ static uint32 dump_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32
case 3:
{
if (driver.info_3 == NULL)
- success=5;
+ result=5;
else {
info3=driver.info_3;
@@ -1573,17 +1571,17 @@ static uint32 dump_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32
DEBUGADD(106,("dependentfile:[%s]\n",
info3->dependentfiles[i]));
}
- success=0;
+ result=0;
}
break;
}
default:
DEBUGADD(1,("Level not implemented\n"));
- success=1;
+ result=1;
break;
}
- return (success);
+ return result;
}
/****************************************************************************
@@ -2245,7 +2243,7 @@ debugging function, dump at level 6 the struct in the logs
****************************************************************************/
static uint32 dump_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
{
- uint32 success;
+ uint32 result;
NT_PRINTER_INFO_LEVEL_2 *info2;
DEBUG(106,("Dumping printer at level [%d]\n", level));
@@ -2255,7 +2253,7 @@ static uint32 dump_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
case 2:
{
if (printer.info_2 == NULL)
- success=5;
+ result=5;
else
{
info2=printer.info_2;
@@ -2283,17 +2281,17 @@ static uint32 dump_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
DEBUGADD(106,("printprocessor:[%s]\n", info2->printprocessor));
DEBUGADD(106,("datatype:[%s]\n", info2->datatype));
DEBUGADD(106,("parameters:[%s]\n", info2->parameters));
- success=0;
+ result=0;
}
break;
}
default:
DEBUGADD(1,("Level not implemented\n"));
- success=1;
+ result=1;
break;
}
- return (success);
+ return result;
}
/****************************************************************************
@@ -2328,7 +2326,7 @@ void get_printer_subst_params(int snum, fstring *printername, fstring *sharename
uint32 mod_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
{
- uint32 success;
+ uint32 result;
dump_a_printer(printer, level);
@@ -2337,15 +2335,15 @@ uint32 mod_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
case 2:
{
printer.info_2->c_setprinter++;
- success=update_a_printer_2(printer.info_2);
+ result=update_a_printer_2(printer.info_2);
break;
}
default:
- success=1;
+ result=1;
break;
}
- return (success);
+ return result;
}
/****************************************************************************
@@ -2355,7 +2353,7 @@ uint32 mod_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
uint32 add_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
{
- uint32 success;
+ uint32 result;
dump_a_printer(printer, level);
@@ -2373,15 +2371,15 @@ uint32 add_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
printer.info_2->changeid=time_nt.low;
printer.info_2->c_setprinter++;
- success=update_a_printer_2(printer.info_2);
+ result=update_a_printer_2(printer.info_2);
break;
}
default:
- success=1;
+ result=1;
break;
}
- return (success);
+ return result;
}
/****************************************************************************
@@ -2390,7 +2388,7 @@ uint32 add_a_printer(NT_PRINTER_INFO_LEVEL printer, uint32 level)
uint32 get_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, fstring sharename)
{
- uint32 success;
+ uint32 result;
NT_PRINTER_INFO_LEVEL *printer = NULL;
*pp_printer = NULL;
@@ -2406,8 +2404,8 @@ uint32 get_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, fstring s
return 1;
}
ZERO_STRUCTP(printer);
- success=get_a_printer_2(&printer->info_2, sharename);
- if (success == 0) {
+ result=get_a_printer_2(&printer->info_2, sharename);
+ if (result == 0) {
dump_a_printer(*printer, level);
*pp_printer = printer;
} else {
@@ -2416,13 +2414,13 @@ uint32 get_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, fstring s
break;
}
default:
- success=1;
+ result=1;
break;
}
- DEBUG(10,("get_a_printer: [%s] level %u returning %u\n", sharename, (unsigned int)level, (unsigned int)success));
+ DEBUG(10,("get_a_printer: [%s] level %u returning %u\n", sharename, (unsigned int)level, (unsigned int)result));
- return (success);
+ return result;
}
/****************************************************************************
@@ -2431,7 +2429,7 @@ uint32 get_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level, fstring s
uint32 free_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level)
{
- uint32 success;
+ uint32 result;
NT_PRINTER_INFO_LEVEL *printer = *pp_printer;
DEBUG(104,("freeing a printer at level [%d]\n", level));
@@ -2446,29 +2444,29 @@ uint32 free_a_printer(NT_PRINTER_INFO_LEVEL **pp_printer, uint32 level)
if (printer->info_2 != NULL)
{
free_nt_printer_info_level_2(&printer->info_2);
- success=0;
+ result=0;
}
else
{
- success=4;
+ result=4;
}
break;
}
default:
- success=1;
+ result=1;
break;
}
safe_free(printer);
*pp_printer = NULL;
- return (success);
+ return result;
}
/****************************************************************************
****************************************************************************/
uint32 add_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
{
- uint32 success;
+ uint32 result;
DEBUG(104,("adding a printer at level [%d]\n", level));
dump_a_printer_driver(driver, level);
@@ -2476,51 +2474,51 @@ uint32 add_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
{
case 3:
{
- success=add_a_printer_driver_3(driver.info_3);
+ result=add_a_printer_driver_3(driver.info_3);
break;
}
case 6:
{
- success=add_a_printer_driver_6(driver.info_6);
+ result=add_a_printer_driver_6(driver.info_6);
break;
}
default:
- success=1;
+ result=1;
break;
}
- return (success);
+ return result;
}
/****************************************************************************
****************************************************************************/
uint32 get_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL *driver, uint32 level,
fstring printername, fstring architecture, uint32 version)
{
- uint32 success;
+ uint32 result;
switch (level)
{
case 3:
{
- success=get_a_printer_driver_3(&driver->info_3, printername, architecture, version);
+ result=get_a_printer_driver_3(&driver->info_3, printername, architecture, version);
break;
}
default:
- success=1;
+ result=1;
break;
}
- if (success == 0)
+ if (result == 0)
dump_a_printer_driver(*driver, level);
- return (success);
+ return result;
}
/****************************************************************************
****************************************************************************/
uint32 free_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
{
- uint32 success;
+ uint32 result;
switch (level)
{
@@ -2533,11 +2531,11 @@ uint32 free_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
safe_free(info3->dependentfiles);
ZERO_STRUCTP(info3);
safe_free(info3);
- success=0;
+ result=0;
}
else
{
- success=4;
+ result=4;
}
break;
}
@@ -2551,19 +2549,19 @@ uint32 free_a_printer_driver(NT_PRINTER_DRIVER_INFO_LEVEL driver, uint32 level)
safe_free(info6->previousnames);
ZERO_STRUCTP(info6);
safe_free(info6);
- success=0;
+ result=0;
}
else
{
- success=4;
+ result=4;
}
break;
}
default:
- success=1;
+ result=1;
break;
}
- return (success);
+ return result;
}
/****************************************************************************
diff --git a/testsuite/printing/psec.c b/testsuite/printing/psec.c
index 9b1fc7c46c4..fa26ed7dfff 100644
--- a/testsuite/printing/psec.c
+++ b/testsuite/printing/psec.c
@@ -71,7 +71,7 @@ TDB_CONTEXT *tdb;
char *ace_type_to_str(uint ace_type)
{
- fstring temp;
+ static fstring temp;
switch(ace_type) {
case SEC_ACE_TYPE_ACCESS_DENIED:
@@ -99,7 +99,7 @@ uint str_to_ace_type(char *ace_type)
char *ace_mask_to_str(uint32 ace_mask)
{
- fstring temp;
+ static fstring temp;
switch (ace_mask) {
case PRINTER_ACE_FULL_CONTROL:
@@ -132,7 +132,7 @@ uint32 str_to_ace_mask(char *ace_mask)
char *ace_to_str(SEC_ACE *ace)
{
- pstring temp;
+ static pstring temp;
fstring sidstr;
sid_to_string(sidstr, &ace->sid);
generated by cgit (git 2.34.1) at 2024-06-23 09:26:04 +0000