From f2b57195e0e3f84477b40d60fd8da81f421475b3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 28 Jan 2003 13:17:06 +0000 Subject: Put in ab's conversion to XML. First step: Make all the SGML docs conform to the (more strict) XML syntax. (This used to be commit d9cf973a466ff684f0867b5d7fd494de6967aa79) --- docs/docbook/devdoc/NetBIOS.sgml | 2 +- docs/docbook/devdoc/Tracing.sgml | 4 ++-- docs/docbook/devdoc/cifsntdomain.sgml | 16 ++++++++-------- docs/docbook/devdoc/encryption.sgml | 6 +++--- docs/docbook/devdoc/printing.sgml | 8 ++++---- docs/docbook/devdoc/sam.sgml | 4 ++-- docs/docbook/devdoc/unix-smb.sgml | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'docs/docbook/devdoc') diff --git a/docs/docbook/devdoc/NetBIOS.sgml b/docs/docbook/devdoc/NetBIOS.sgml index ec9d3af563..6b4eb34b76 100644 --- a/docs/docbook/devdoc/NetBIOS.sgml +++ b/docs/docbook/devdoc/NetBIOS.sgml @@ -101,7 +101,7 @@ rfc1001.txt describes, amongst other things, the implementation and use of, a 'NetBIOS Name Service'. NT/AS offers 'Windows Internet Name Service' which is fully rfc1001/2 compliant, but has had to take specific action with certain NetBIOS names in order to make it useful. (for example, it -deals with the registration of <1c> <1d> <1e> names all in different ways. +deals with the registration of <1c> <1d> <1e> names all in different ways. I recommend the reading of the Microsoft WINS Server Help files for full details). diff --git a/docs/docbook/devdoc/Tracing.sgml b/docs/docbook/devdoc/Tracing.sgml index 3a0e4ba1a9..ccf1e1c3c8 100644 --- a/docs/docbook/devdoc/Tracing.sgml +++ b/docs/docbook/devdoc/Tracing.sgml @@ -80,11 +80,11 @@ stderr output from this command to a file for later perusal. For example, if I'm using a csh style shell: -strace -f -p 3872 >& strace.out +strace -f -p 3872 >& strace.out or with a sh style shell: -strace -f -p 3872 > strace.out 2>&1 +strace -f -p 3872 > strace.out 2>&1 Note the "-f" option. This is only available on some systems, and diff --git a/docs/docbook/devdoc/cifsntdomain.sgml b/docs/docbook/devdoc/cifsntdomain.sgml index f64e1b37d6..0197f4e1be 100644 --- a/docs/docbook/devdoc/cifsntdomain.sgml +++ b/docs/docbook/devdoc/cifsntdomain.sgml @@ -2175,7 +2175,7 @@ return 0 - indicates success - LSA SAM Logon @@ -2279,7 +2279,7 @@ Note: presumably, the SAM_INFO structure is validated, and a (currently Note: mailslots will contain a response mailslot, to which the response - should be sent. the target NetBIOS name is REQUEST_NAME<20>, where + should be sent. the target NetBIOS name is REQUEST_NAME<20>, where REQUEST_NAME is the name of the machine that sent the request. @@ -2361,7 +2361,7 @@ Note: mailslots will contain a response mailslot, to which the response - SAM Logon @@ -2663,16 +2663,16 @@ pwdump(machine$) (initially) == md4(lmowf(unicode(machine))) Protocol -C->S ReqChal,Cc S->C Cs +C->S ReqChal,Cc S->C Cs -C & S compute session key Ks = E(PW[9..15],E(PW[0..6],Add(Cc,Cs))) +C & S compute session key Ks = E(PW[9..15],E(PW[0..6],Add(Cc,Cs))) C: Rc = Cred(Ks,Cc) C->S Authenticate,Rc S: Rs = Cred(Ks,Cs), -assert(Rc == Cred(Ks,Cc)) S->C Rs C: assert(Rs == Cred(Ks,Cs)) +assert(Rc == Cred(Ks,Cc)) S->C Rs C: assert(Rs == Cred(Ks,Cs)) @@ -2682,7 +2682,7 @@ on registry settings. This will also occur weekly afterwards. -C: Tc = Time(), Rc' = Cred(Ks,Rc+Tc) C->S ServerPasswordSet,Rc',Tc, +C: Tc = Time(), Rc' = Cred(Ks,Rc+Tc) C->S ServerPasswordSet,Rc',Tc, arc4(Ks[0..7,16],lmowf(randompassword()) C: Rc = Cred(Ks,Rc+Tc+1) S: assert(Rc' == Cred(Ks,Rc+Tc)), Ts = Time() S: Rs' = Cred(Ks,Rs+Tc+1) S->C Rs',Ts C: assert(Rs' == Cred(Ks,Rs+Tc+1)) S: Rs = Rs' @@ -2694,7 +2694,7 @@ such as workstation and domain omitted) -C: Tc = Time(), Rc' = Cred(Ks,Rc+Tc) C->S NetLogonSamLogon,Rc',Tc,U, +C: Tc = Time(), Rc' = Cred(Ks,Rc+Tc) C->S NetLogonSamLogon,Rc',Tc,U, arc4(Ks[0..7,16],16,ntowf(P),16), arc4(Ks[0..7,16],16,lmowf(P),16) S: assert(Rc' == Cred(Ks,Rc+Tc)) assert(passwords match those in SAM) S: Ts = Time() diff --git a/docs/docbook/devdoc/encryption.sgml b/docs/docbook/devdoc/encryption.sgml index 7d95edd34a..3ca8aa109c 100644 --- a/docs/docbook/devdoc/encryption.sgml +++ b/docs/docbook/devdoc/encryption.sgml @@ -90,7 +90,7 @@ - <anchor id="SMBPASSWDFILEFORMAT">The smbpasswd file + <anchor id="SMBPASSWDFILEFORMAT"/>The smbpasswd file In order for Samba to participate in the above protocol it must be able to look up the 16 byte hashed values given a user name. @@ -102,11 +102,11 @@ /etc/passwd and the smbpasswd file, a utility, mksmbpasswd.sh, is provided to generate a smbpasswd file from a UNIX /etc/passwd file. - To generate the smbpasswd file from your /etc/passwd - file use the following command : + file use the following command: $ cat /etc/passwd | mksmbpasswd.sh > /usr/local/samba/private/smbpasswd diff --git a/docs/docbook/devdoc/printing.sgml b/docs/docbook/devdoc/printing.sgml index 2ef64353e1..363b9fb6e5 100644 --- a/docs/docbook/devdoc/printing.sgml +++ b/docs/docbook/devdoc/printing.sgml @@ -28,7 +28,7 @@ Printing Interface to Various Back ends Samba uses a table of function pointers to seven functions. The -function prototypes are defined in the printif structure declared +function prototypes are defined in the printif structure declared in printing.h. @@ -199,7 +199,7 @@ object when the client issues a GetJob(level == 2) request. -ChangeID & Client Caching of Printer Information +ChangeID and Client Caching of Printer Information @@ -345,7 +345,7 @@ information -A SPOOL_NOTIFY_INFO contains: +A SPOOL_NOTIFY_INFO contains: @@ -359,7 +359,7 @@ in the SPOOL_NOTIFY_INFO_DATA array -The SPOOL_NOTIFY_INFO_DATA entries contain: +The SPOOL_NOTIFY_INFO_DATA entries contain: diff --git a/docs/docbook/devdoc/sam.sgml b/docs/docbook/devdoc/sam.sgml index 654bd5fe9c..84c17d65e2 100644 --- a/docs/docbook/devdoc/sam.sgml +++ b/docs/docbook/devdoc/sam.sgml @@ -27,7 +27,7 @@ accessed. For example, when you call -< + NTSTATUS sam_get_account_by_name(const SAM_CONTEXT *context, const NT_USER_TOKEN *access_token, uint32 access_desired, const char *domain, const char *name, SAM_ACCOUNT_HANDLE **account) @@ -182,7 +182,7 @@ This is where smbd, samtest and whatever end-user replacement we have for pdbedit sits. They use only the SAM interface, and do not get 'special knowledge' of what is below them. - + SAM Interface diff --git a/docs/docbook/devdoc/unix-smb.sgml b/docs/docbook/devdoc/unix-smb.sgml index aae96edfb7..d6a658089c 100644 --- a/docs/docbook/devdoc/unix-smb.sgml +++ b/docs/docbook/devdoc/unix-smb.sgml @@ -13,7 +13,7 @@ This is a short document that describes some of the issues that confront a SMB implementation on unix, and how Samba copes with -them. They may help people who are looking at unix<->PC +them. They may help people who are looking at unix<->PC interoperability. -- cgit