[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  6816135a2cd s3 lib system: Change signature of sys_proc_fd_path
       via  29fa97390d0 s3 lib system: Fix clang compilation error
       via  f9ed4f7028a HEIMDAL: krb5_storage_free(NULL) should work
      from  1691cd7738b s3:testparm: Warn about 'server schannel = no'

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


- Log -----------------------------------------------------------------
commit 6816135a2cdbc91c079de2716a333d774a9adbc5
Author: Gary Lockyer <gary at catalyst.net.nz>
Date:   Tue Feb 9 14:07:53 2021 +1300

    s3 lib system: Change signature of sys_proc_fd_path
    
    It's always called with sizeof(buf)
    
    Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Feb  9 04:16:43 UTC 2021 on sn-devel-184

commit 29fa97390d0ef4ff993dfbb2643467c12dd31e76
Author: Gary Lockyer <gary at catalyst.net.nz>
Date:   Tue Feb 9 09:06:12 2021 +1300

    s3 lib system: Fix clang compilation error
    
    Fix clang compilation error:
       error: format string is not a string literal [-Werror,-Wformat-nonliteral]
    
    Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit f9ed4f7028a5ed29026ac8ef1b47b63755ba98f8
Author: Paul Wise <pabs3 at bonedaddy.net>
Date:   Mon Feb 29 11:58:45 2016 -0600

    HEIMDAL: krb5_storage_free(NULL) should work
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12505
    
    Signed-off-by: Paul Wise <pabs3 at bonedaddy.net>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Original-author: Nicolas Williams <nico at twosigma.com>
    (cherry-picked from heimdal commit b3db07d5f0e03f6a1a0a392e70f9675e19a6d6af)

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

Summary of changes:
 source3/include/proto.h          | 2 +-
 source3/lib/system.c             | 9 ++++++++-
 source4/heimdal/lib/krb5/store.c | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 16cd587ed30..ab42efeefd9 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -237,7 +237,7 @@ int sys_get_number_of_cores(void);
 #endif
 
 bool sys_have_proc_fds(void);
-const char *sys_proc_fd_path(int fd, char *buf, int bufsize);
+const char *sys_proc_fd_path(int fd, char *buf, size_t bufsize);
 
 struct stat;
 void init_stat_ex_from_stat (struct stat_ex *dst,
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 8ea2af9f93b..ad525737c5b 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1068,7 +1068,7 @@ bool sys_have_proc_fds(void)
 	return have_proc_fds;
 }
 
-const char *sys_proc_fd_path(int fd, char *buf, int bufsize)
+const char *sys_proc_fd_path(int fd, char *buf, size_t bufsize)
 {
 	int written;
 
@@ -1076,10 +1076,17 @@ const char *sys_proc_fd_path(int fd, char *buf, int bufsize)
 		return NULL;
 	}
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#endif
 	written = snprintf(buf,
 			   bufsize,
 			   proc_fd_pattern,
 			   fd);
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 	if (written >= bufsize) {
 		return NULL;
 	}
diff --git a/source4/heimdal/lib/krb5/store.c b/source4/heimdal/lib/krb5/store.c
index 17de78e9e74..31afb23c983 100644
--- a/source4/heimdal/lib/krb5/store.c
+++ b/source4/heimdal/lib/krb5/store.c
@@ -270,6 +270,8 @@ krb5_storage_get_eof_code(krb5_storage *sp)
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_storage_free(krb5_storage *sp)
 {
+    if (sp == NULL)
+        return 0;
     if(sp->free)
 	(*sp->free)(sp);
     free(sp->data);


-- 
Samba Shared Repository