The branch, master has been updated via b96cea4 Fix some blank line endings from d2642cb dns: Fix CID 1034969 Uninitialized scalar variable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b96cea4aa5b707cbd01d75ecb4782496160db961 Author: Volker Lendecke <v...@samba.org> Date: Fri Jun 21 17:56:08 2013 +0200 Fix some blank line endings Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Fri Jun 21 19:57:06 CEST 2013 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: lib/tevent/tevent_signal.c | 8 +- source3/include/libsmb_internal.h | 31 +- source3/include/libsmbclient.h | 334 ++++++++++---------- source3/libsmb/libsmb_cache.c | 22 +- source3/libsmb/libsmb_compat.c | 16 +- source3/libsmb/libsmb_context.c | 6 +- source3/libsmb/libsmb_file.c | 14 +- source3/libsmb/libsmb_misc.c | 10 +- source3/libsmb/libsmb_path.c | 6 +- source3/libsmb/libsmb_printjob.c | 4 +- source3/libsmb/libsmb_server.c | 18 +- source3/libsmb/libsmb_setget.c | 6 +- source3/libsmb/libsmb_stat.c | 6 +- source4/rpc_server/lsa/dcesrv_lsa.c | 579 +++++++++++++++++------------------ 14 files changed, 527 insertions(+), 533 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c index b5a56ef..0fdf646 100644 --- a/lib/tevent/tevent_signal.c +++ b/lib/tevent/tevent_signal.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. common events code for signal events @@ -311,7 +311,7 @@ struct tevent_signal *tevent_common_add_signal(struct tevent_context *ev, sig_state->oldact[signum] = talloc(sig_state, struct sigaction); if (sig_state->oldact[signum] == NULL) { talloc_free(se); - return NULL; + return NULL; } if (sigaction(signum, &act, sig_state->oldact[signum]) == -1) { talloc_free(se); @@ -355,7 +355,7 @@ int tevent_common_check_signal(struct tevent_context *ev) if (!sig_state || !TEVENT_SIG_PENDING(sig_state->got_signal)) { return 0; } - + for (i=0;i<TEVENT_NUM_SIGNALS+1;i++) { struct tevent_common_signal_list *sl, *next; struct tevent_sigcounter counter = sig_state->signal_count[i]; @@ -404,7 +404,7 @@ int tevent_common_check_signal(struct tevent_context *ev) uint32_t ofs = (counter.seen + j) % TEVENT_SA_INFO_QUEUE_COUNT; se->handler(ev, se, i, 1, - (void*)&sig_state->sig_info[i][ofs], + (void*)&sig_state->sig_info[i][ofs], se->private_data); if (!exists) { break; diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h index 7ce37d2..63c96fe 100644 --- a/source3/include/libsmb_internal.h +++ b/source3/include/libsmb_internal.h @@ -1,23 +1,23 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -82,11 +82,10 @@ struct _SMBCSRV { struct policy_handle pol; SMBCSRV *next, *prev; - }; -/* - * Keep directory entries in a list +/* + * Keep directory entries in a list */ struct smbc_dir_list { struct smbc_dir_list *next; @@ -96,9 +95,9 @@ struct smbc_dir_list { /* * Structure for open file management - */ + */ struct _SMBCFILE { - int cli_fd; + int cli_fd; char *fname; off_t offset; struct _SMBCSRV *srv; @@ -136,7 +135,7 @@ struct SMBC_internal_data { * server connection list */ SMBCSRV * servers; - + /* * open file/dir list */ @@ -170,7 +169,7 @@ struct SMBC_internal_data { void * user_data; /* - * Should we attempt UNIX smb encryption ? + * Should we attempt UNIX smb encryption ? * Set to 0 if we should never attempt, set to 1 if * encryption requested, set to 2 if encryption required. */ @@ -252,13 +251,13 @@ int SMBC_add_cached_server(SMBCCTX * context, SMBCSRV * newsrv, const char * server, - const char * share, + const char * share, const char * workgroup, const char * username); SMBCSRV * SMBC_get_cached_server(SMBCCTX * context, - const char * server, + const char * server, const char * share, const char * workgroup, const char * user); @@ -335,7 +334,7 @@ SMBC_unlink_ctx(SMBCCTX *context, int SMBC_rename_ctx(SMBCCTX *ocontext, - const char *oname, + const char *oname, SMBCCTX *ncontext, const char *nname); @@ -381,7 +380,7 @@ SMBC_getatr(SMBCCTX * context, SMB_INO_T *ino); bool -SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path, +SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path, time_t create_time, time_t access_time, time_t write_time, diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h index 137aebe..42e41f7 100644 --- a/source3/include/libsmbclient.h +++ b/source3/include/libsmbclient.h @@ -4,20 +4,20 @@ Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000 Copyright (C) John Terpsra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>. =====================================================================*/ @@ -37,7 +37,7 @@ extern "C" { #endif /*-------------------------------------------------------------------*/ -/* The following are special comments to instruct DOXYGEN (automated +/* The following are special comments to instruct DOXYGEN (automated * documentation tool: */ /** \defgroup libsmbclient @@ -70,7 +70,7 @@ extern "C" { * \ingroup libsmbclient * Functions that don't fit in to other categories */ -/*-------------------------------------------------------------------*/ +/*-------------------------------------------------------------------*/ /* Make sure we have the following includes for now ... */ #include <sys/types.h> @@ -96,19 +96,19 @@ extern "C" { * Structure that represents a directory entry. * */ -struct smbc_dirent +struct smbc_dirent { /** Type of entity. SMBC_WORKGROUP=1, - SMBC_SERVER=2, + SMBC_SERVER=2, SMBC_FILE_SHARE=3, SMBC_PRINTER_SHARE=4, SMBC_COMMS_SHARE=5, SMBC_IPC_SHARE=6, SMBC_DIR=7, SMBC_FILE=8, - SMBC_LINK=9,*/ - unsigned int smbc_type; + SMBC_LINK=9,*/ + unsigned int smbc_type; /** Length of this smbc_dirent in bytes */ @@ -117,14 +117,14 @@ struct smbc_dirent * null terminator) */ unsigned int commentlen; - /** Points to the null terminated comment string + /** Points to the null terminated comment string */ char *comment; /** The length of the name string in bytes (does not include * null terminator) */ unsigned int namelen; - /** Points to the null terminated name string + /** Points to the null terminated name string */ char name[1]; }; @@ -207,24 +207,24 @@ typedef int smbc_bool; * */ #ifndef _CLIENT_H -struct print_job_info +struct print_job_info { /** numeric ID of the print job */ unsigned short id; - + /** represents print job priority (lower numbers mean higher priority) */ unsigned short priority; - + /** Size of the print job */ size_t size; - + /** Name of the user that owns the print job */ char user[128]; - + /** Name of the print job. This will have no name if an anonymous print * file was opened. Ie smb://server/printer */ @@ -238,17 +238,17 @@ struct print_job_info /**@ingroup structure - * Server handle + * Server handle */ typedef struct _SMBCSRV SMBCSRV; /**@ingroup structure - * File or directory handle + * File or directory handle */ typedef struct _SMBCFILE SMBCFILE; /**@ingroup structure - * File or directory handle + * File or directory handle */ typedef struct _SMBCCTX SMBCCTX; @@ -292,25 +292,25 @@ typedef struct _SMBCCTX SMBCCTX; * @param wg Pointer to buffer containing a "hint" for the * workgroup to be authenticated. Should be filled in * with the correct workgroup if the hint is wrong. - * + * * @param wglen The size of the workgroup buffer in bytes * * @param un Pointer to buffer containing a "hint" for the * user name to be use for authentication. Should be * filled in with the correct workgroup if the hint is * wrong. - * + * * @param unlen The size of the username buffer in bytes * - * @param pw Pointer to buffer containing to which password + * @param pw Pointer to buffer containing to which password * copied - * + * * @param pwlen The size of the password buffer in bytes - * + * */ -typedef void (*smbc_get_auth_data_fn)(const char *srv, +typedef void (*smbc_get_auth_data_fn)(const char *srv, const char *shr, - char *wg, int wglen, + char *wg, int wglen, char *un, int unlen, char *pw, int pwlen); /**@ingroup callback @@ -333,26 +333,26 @@ typedef void (*smbc_get_auth_data_fn)(const char *srv, * @param wg Pointer to buffer containing a "hint" for the * workgroup to be authenticated. Should be filled in * with the correct workgroup if the hint is wrong. - * + * * @param wglen The size of the workgroup buffer in bytes * * @param un Pointer to buffer containing a "hint" for the * user name to be use for authentication. Should be * filled in with the correct workgroup if the hint is * wrong. - * + * * @param unlen The size of the username buffer in bytes * - * @param pw Pointer to buffer containing to which password + * @param pw Pointer to buffer containing to which password * copied - * + * * @param pwlen The size of the password buffer in bytes - * + * */ typedef void (*smbc_get_auth_data_with_context_fn)(SMBCCTX *c, - const char *srv, + const char *srv, const char *shr, - char *wg, int wglen, + char *wg, int wglen, char *un, int unlen, char *pw, int pwlen); @@ -362,9 +362,9 @@ typedef void (*smbc_get_auth_data_with_context_fn)(SMBCCTX *c, * * @param i pointer to print job information structure * - */ + */ typedef void (*smbc_list_print_job_fn)(struct print_job_info *i); - + /**@ingroup callback * Check if a server is still good @@ -375,7 +375,7 @@ typedef void (*smbc_list_print_job_fn)(struct print_job_info *i); * * @return 0 when connection is good. 1 on error. * - */ + */ typedef int (*smbc_check_server_fn)(SMBCCTX * c, SMBCSRV *srv); /**@ingroup callback @@ -387,7 +387,7 @@ typedef int (*smbc_check_server_fn)(SMBCCTX * c, SMBCSRV *srv); * * @return 0 on success. 1 on failure. * - */ + */ typedef int (*smbc_remove_unused_server_fn)(SMBCCTX * c, SMBCSRV *srv); @@ -398,7 +398,7 @@ typedef int (*smbc_remove_unused_server_fn)(SMBCCTX * c, SMBCSRV *srv); * * @param srv pointer to server to add * - * @param server server name + * @param server server name * * @param share share name * @@ -408,8 +408,8 @@ typedef int (*smbc_remove_unused_server_fn)(SMBCCTX * c, SMBCSRV *srv); * * @return 0 on success. 1 on failure. * - */ -typedef int (*smbc_add_cached_srv_fn) (SMBCCTX * c, SMBCSRV *srv, + */ +typedef int (*smbc_add_cached_srv_fn) (SMBCCTX * c, SMBCSRV *srv, const char * server, const char * share, const char * workgroup, const char * username); @@ -428,7 +428,7 @@ typedef int (*smbc_add_cached_srv_fn) (SMBCCTX * c, SMBCSRV *srv, * * @return pointer to SMBCSRV on success. NULL on failure. * - */ + */ typedef SMBCSRV * (*smbc_get_cached_srv_fn) (SMBCCTX * c, const char * server, const char * share, const char * workgroup, const char * username); @@ -442,7 +442,7 @@ typedef SMBCSRV * (*smbc_get_cached_srv_fn) (SMBCCTX * c, const char * server, * * @return 0 when found and removed. 1 on failure. * - */ + */ typedef int (*smbc_remove_cached_srv_fn)(SMBCCTX * c, SMBCSRV *srv); @@ -453,7 +453,7 @@ typedef int (*smbc_remove_cached_srv_fn)(SMBCCTX * c, SMBCSRV *srv); * * @return 0 when found and removed. 1 on failure. * - */ + */ typedef int (*smbc_purge_cached_fn) (SMBCCTX * c); @@ -1095,7 +1095,7 @@ SMBCCTX * smbc_new_context(void); * * * @return Returns 0 on succes. Returns 1 on failure with errno set: - * - EBUSY Server connections are still used, Files are open or cache + * - EBUSY Server connections are still used, Files are open or cache * could not be purged * - EBADF context == NULL * @@ -1143,7 +1143,7 @@ smbc_option_get(SMBCCTX *context, * is perfectly safe, but it might leak memory on * smbc_context_init() failure. Avoid this. * You'll have to call smbc_free_context() yourself - * on failure. + * on failure. */ SMBCCTX * smbc_init_context(SMBCCTX * context); @@ -1152,14 +1152,14 @@ SMBCCTX * smbc_init_context(SMBCCTX * context); * Initialize the samba client library. * * Must be called before using any of the smbclient API function - * - * @param fn The function that will be called to obtaion + * + * @param fn The function that will be called to obtaion * authentication credentials. * * @param debug Allows caller to set the debug level. Can be * changed in smb.conf file. Allows caller to set * debugging if no smb.conf. - * + * * @return 0 on success, < 0 on error with errno set: * - ENOMEM Out of memory * - ENOENT The smb.conf file would not load @@ -1195,25 +1195,25 @@ SMBCCTX * smbc_set_context(SMBCCTX * new_context); /**@ingroup file * Open a file on an SMB server. * - * @param furl The smb url of the file to be opened. + * @param furl The smb url of the file to be opened. * - * @param flags Is one of O_RDONLY, O_WRONLY or O_RDWR which + * @param flags Is one of O_RDONLY, O_WRONLY or O_RDWR which * request opening the file read-only,write-only * or read/write. flags may also be bitwise-or'd with - * one or more of the following: - * O_CREAT - If the file does not exist it will be + * one or more of the following: + * O_CREAT - If the file does not exist it will be * created. - * O_EXCL - When used with O_CREAT, if the file - * already exists it is an error and the open will - * fail. + * O_EXCL - When used with O_CREAT, if the file + * already exists it is an error and the open will + * fail. * O_TRUNC - If the file already exists it will be * truncated. - * O_APPEND The file is opened in append mode + * O_APPEND The file is opened in append mode * - * @param mode mode specifies the permissions to use if a new - * file is created. It is modified by the + * @param mode mode specifies the permissions to use if a new + * file is created. It is modified by the * process's umask in the usual way: the permissions - * of the created file are (mode & ~umask) -- Samba Shared Repository