[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  e7c683b s3:vfs:gpfs: remove extra empty lines.
       via  f365f9f s3:smbd: make dptr_ReadDirName() static.
       via  f4d8387 s3: libwbclient: Don't break out of loop too soon - find all parameters.
      from  c863c3a libwbclient: Call correct function for wbcPingDc2 test

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


- Log -----------------------------------------------------------------
commit e7c683ba6974e4d721853ad88e26c33ad7f15775
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 3 09:58:30 2014 +0200

    s3:vfs:gpfs: remove extra empty lines.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jul 10 02:50:44 CEST 2014 on sn-devel-104

commit f365f9f8af555be94e085a0726e90058d1b991ae
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jul 3 09:57:02 2014 +0200

    s3:smbd: make dptr_ReadDirName() static.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit f4d83872e0b030bf15d83132ceaa188fdeb60c70
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 8 16:36:30 2014 -0700

    s3: libwbclient: Don't break out of loop too soon - find all parameters.
    
    Fix bug #10692: wbcCredentialCache fails if challenge_blob is not first
    
    https://bugzilla.samba.org/show_bug.cgi?id=10692
    
    Signed-off-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 nsswitch/libwbclient/wbc_pam.c |    2 --
 source3/modules/gpfs.c         |    2 --
 source3/smbd/dir.c             |    8 ++++----
 source3/smbd/proto.h           |    4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index 51fc3bc..bfd10b7 100644
--- a/nsswitch/libwbclient/wbc_pam.c
+++ b/nsswitch/libwbclient/wbc_pam.c
@@ -1227,11 +1227,9 @@ wbcErr wbcCredentialCache(struct wbcCredentialCacheParams *params,
 	for (i=0; i<params->num_blobs; i++) {
 		if (strcasecmp(params->blobs[i].name, "initial_blob") == 0) {
 			initial_blob = &params->blobs[i];
-			break;
 		}
 		if (strcasecmp(params->blobs[i].name, "challenge_blob") == 0) {
 			challenge_blob = &params->blobs[i];
-			break;
 		}
 	}
 
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index 53418f0..284e65b 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -161,7 +161,6 @@ int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep,
 
 int get_gpfs_winattrs(char *pathname,struct gpfs_winattr *attrs)
 {
-
 	if (gpfs_get_winattrs_path_fn == NULL) {
                 errno = ENOSYS;
                 return -1;
@@ -172,7 +171,6 @@ int get_gpfs_winattrs(char *pathname,struct gpfs_winattr *attrs)
 
 int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr *attrs)
 {
-
 	if (gpfs_get_winattrs_fn == NULL) {
                 errno = ENOSYS;
                 return -1;
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index cb49a96..038281e 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -754,10 +754,10 @@ static const char *dptr_normal_ReadDirName(struct dptr_struct *dptr,
  Return the next visible file name, skipping veto'd and invisible files.
 ****************************************************************************/
 
-char *dptr_ReadDirName(TALLOC_CTX *ctx,
-			struct dptr_struct *dptr,
-			long *poffset,
-			SMB_STRUCT_STAT *pst)
+static char *dptr_ReadDirName(TALLOC_CTX *ctx,
+			      struct dptr_struct *dptr,
+			      long *poffset,
+			      SMB_STRUCT_STAT *pst)
 {
 	struct smb_filename smb_fname_base;
 	char *name = NULL;
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index ea2f022..902c2ca 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -206,10 +206,6 @@ bool dptr_has_wild(struct dptr_struct *dptr);
 int dptr_dnum(struct dptr_struct *dptr);
 bool dptr_get_priv(struct dptr_struct *dptr);
 void dptr_set_priv(struct dptr_struct *dptr);
-char *dptr_ReadDirName(TALLOC_CTX *ctx,
-			struct dptr_struct *dptr,
-			long *poffset,
-			SMB_STRUCT_STAT *pst);
 bool dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, SMB_STRUCT_STAT *pst);
 void dptr_init_search_op(struct dptr_struct *dptr);
 bool dptr_fill(struct smbd_server_connection *sconn,


-- 
Samba Shared Repository