[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  1d949cb s3:auth: fix function header comment for user_sid_in_group_sid()
       via  cbc6a2f pidl: change strange spelling __donnot_use_enum_* to __do_not_use_enum_*
      from  c5b150b s3:auth: fix create_token_from_sid() to not fail in the winbindd case

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1d949cb0e51a086006612271d6f08305b68aa09c
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 10 21:56:42 2012 +0100

    s3:auth: fix function header comment for user_sid_in_group_sid()
    
    This is embarrassing: the commit 0770a4c01bef26ec51321cd5b97aea4eab9e00a8
    which intended to fix an earlier copy'n'paste error, contained another
    typo, fixed with this commit...
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Tue Dec 11 00:04:45 CET 2012 on sn-devel-104

commit cbc6a2f5e41100a12f03838396d652af5f6c105d
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 10 16:58:43 2012 +0100

    pidl: change strange spelling __donnot_use_enum_* to __do_not_use_enum_*
    
    Signed-off-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 pidl/lib/Parse/Pidl/Samba4/Header.pm |    2 +-
 source3/auth/token_util.c            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/Samba4/Header.pm b/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 3736315..49c5afa 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -142,7 +142,7 @@ sub HeaderEnum($$;$)
 		my $count = 0;
 		my $with_val = 0;
 		my $without_val = 0;
-		pidl " { __donnot_use_enum_$name=0x7FFFFFFF}\n";
+		pidl " { __do_not_use_enum_$name=0x7FFFFFFF}\n";
 		foreach my $e (@{$enum->{ELEMENTS}}) {
 			my $t = "$e";
 			my $name;
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 6f4bce0..8a73a71 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -853,7 +853,7 @@ done:
 }
 
 /***************************************************************************
- Build upon create_token_from_usersid:
+ Build upon create_token_from_sid:
 
  Expensive helper function to figure out whether a user given its sid is
  member of a particular group.


-- 
Samba Shared Repository