[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  c9ddc50 auth/gensec: fix missleading comment
       via  59e838a libcli/smb Move smb_seal.h include to files that use it.
       via  5cb6adb lib/util/charset Remove unused header smb_common.h
      from  7ebd433 libcli/smb: move source3/libsmb/read_smb.* to the toplevel

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


- Log -----------------------------------------------------------------
commit c9ddc5010801068a03e7f2e87c78b3a07a59e1b0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 24 11:07:32 2011 +0200

    auth/gensec: fix missleading comment
    
    We don't talloc_reference for tsocket_addresses.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Oct 24 15:29:47 CEST 2011 on sn-devel-104

commit 59e838a1c4edb4a2fba220cf2374bb0880b6c43d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Oct 24 17:33:59 2011 +1100

    libcli/smb Move smb_seal.h include to files that use it.
    
    This is required because at the moment, smb_seal.h includes references to gssapi structures
    and this causes issues with header dependencies on subsystems that otherwise do not need
    a gssapi dependency.
    
    Andrew Bartlett
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit 5cb6adb5908a743ae7d3f87c2a0f5ca5b76dea6d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Oct 24 16:57:29 2011 +1100

    lib/util/charset Remove unused header smb_common.h
    
    This should fix a compile issue on hosts without gssapi/gssapi.h.
    
    Andrew Bartlett
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 auth/gensec/gensec.c       |    2 +-
 lib/util/charset/charcnv.c |    1 -
 libcli/smb/smb_common.h    |    1 -
 libcli/smb/smb_seal.c      |    1 +
 4 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/gensec/gensec.c b/auth/gensec/gensec.c
index cdc7c67..ec104a7 100644
--- a/auth/gensec/gensec.c
+++ b/auth/gensec/gensec.c
@@ -448,7 +448,7 @@ _PUBLIC_ const char *gensec_get_target_hostname(struct gensec_security *gensec_s
 }
 
 /**
- * Set (and talloc_reference) local and peer socket addresses onto a socket
+ * Set (and copy) local and peer socket addresses onto a socket
  * context on the GENSEC context.
  *
  * This is so that kerberos can include these addresses in
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 076795a..ba08310 100644
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -22,7 +22,6 @@
 */
 #include "includes.h"
 #include "system/iconv.h"
-#include "libcli/smb/smb_common.h"
 
 /**
  * @file
diff --git a/libcli/smb/smb_common.h b/libcli/smb/smb_common.h
index 228e451..1f21e55 100644
--- a/libcli/smb/smb_common.h
+++ b/libcli/smb/smb_common.h
@@ -28,6 +28,5 @@
 #include "libcli/smb/smb_constants.h"
 #include "libcli/smb/smb_util.h"
 #include "libcli/smb/smb_unix_ext.h"
-#include "libcli/smb/smb_seal.h"
 
 #endif
diff --git a/libcli/smb/smb_seal.c b/libcli/smb/smb_seal.c
index bf9576f..67a5512 100644
--- a/libcli/smb/smb_seal.c
+++ b/libcli/smb/smb_seal.c
@@ -21,6 +21,7 @@
 #include "smb_common.h"
 #include "libcli/auth/krb5_wrap.h"
 #include "auth/gensec/gensec.h"
+#include "libcli/smb/smb_seal.h"
 
 #undef malloc
 


-- 
Samba Shared Repository