From c94272f0dce6476800b811e997ab94297486c420 Mon Sep 17 00:00:00 2001 From: Puran Chand Date: Tue, 6 Mar 2018 11:43:33 +0530 Subject: [PATCH 01/64] Added ReadDirPlus API in libsmbclient which returns detailed file properties part of dirent structure Signed-off-by: Puran Chand --- source3/include/client.h | 1 + source3/include/libsmb_internal.h | 10 ++ source3/include/libsmbclient.h | 70 +++++++++++ source3/libsmb/ABI/smbclient-0.3.3.sigs | 184 ++++++++++++++++++++++++++++ source3/libsmb/cli_smb2_fnum.c | 1 + source3/libsmb/clilist.c | 1 + source3/libsmb/libsmb_compat.c | 7 ++ source3/libsmb/libsmb_context.c | 1 + source3/libsmb/libsmb_dir.c | 131 +++++++++++++++++++- source3/libsmb/libsmb_setget.c | 10 ++ source3/libsmb/wscript | 2 +- source4/torture/libsmbclient/libsmbclient.c | 54 ++++++++ 12 files changed, 470 insertions(+), 2 deletions(-) create mode 100644 source3/libsmb/ABI/smbclient-0.3.3.sigs diff --git a/source3/include/client.h b/source3/include/client.h index 1fe3f1cb960..9030a434187 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -108,6 +108,7 @@ struct file_info { uid_t uid; gid_t gid; /* these times are normally kept in GMT */ + struct timespec btime_ts; //birth-time if supported by system struct timespec mtime_ts; struct timespec atime_ts; struct timespec ctime_ts; diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h index 0e0045e8c0e..b38755cd681 100644 --- a/source3/include/libsmb_internal.h +++ b/source3/include/libsmb_internal.h @@ -94,6 +94,11 @@ struct smbc_dir_list { struct smbc_dirent *dirent; }; +struct smbc_dirplus_list { + struct smbc_dirplus_list *next; + struct libsmb_file_info *data; +}; + /* * Structure for open file management @@ -110,6 +115,7 @@ struct _SMBCFILE { struct _SMBCSRV *srv; bool file; struct smbc_dir_list *dir_list, *dir_end, *dir_next; + struct smbc_dirplus_list *dirplus_list, *dirplus_end, *dirplus_next; int dir_type, dir_error; SMBCFILE *next, *prev; @@ -292,6 +298,10 @@ int SMBC_closedir_ctx(SMBCCTX *context, SMBCFILE *dir); +struct libsmb_file_info * +SMBC_readdirplus_ctx(SMBCCTX *context, + SMBCFILE *dir); + struct smbc_dirent * SMBC_readdir_ctx(SMBCCTX *context, SMBCFILE *dir); diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h index 7a2067915af..e56a2d83b6c 100644 --- a/source3/include/libsmbclient.h +++ b/source3/include/libsmbclient.h @@ -129,6 +129,56 @@ struct smbc_dirent char name[1]; }; +/**@ingroup structure + * Structure that represents all attributes of a directory entry. + * + */ +struct libsmb_file_info +{ + /** + * Size of file + */ + uint64_t size; + /** + * Mode of file + */ + uint16_t mode; + /** + * User ID of file + */ + uid_t uid; + /** + * Group ID of file + */ + gid_t gid; + /** + * Birth/Create time of file (if supported by system) + * Otherwise the value will be 0 + */ + struct timespec btime_ts; + /** + * Modified time for the file + */ + struct timespec mtime_ts; + /** + * Access time for the file + */ + struct timespec atime_ts; + /** + * Change time for the file + */ + struct timespec ctime_ts; + /** + * Name of file + */ + char *name; + /** + * Shot name of file + */ + char *short_name; +}; + + /* * Logging callback function */ @@ -975,6 +1025,11 @@ typedef struct smbc_dirent * (*smbc_readdir_fn)(SMBCCTX *c, smbc_readdir_fn smbc_getFunctionReaddir(SMBCCTX *c); void smbc_setFunctionReaddir(SMBCCTX *c, smbc_readdir_fn fn); +typedef struct libsmb_file_info * (*smbc_readdirplus_fn)(SMBCCTX *c, + SMBCFILE *dir); +smbc_readdirplus_fn smbc_getFunctionReaddirPlus(SMBCCTX *c); +void smbc_setFunctionReaddirPlus(SMBCCTX *c, smbc_readdirplus_fn fn); + typedef int (*smbc_getdents_fn)(SMBCCTX *c, SMBCFILE *dir, struct smbc_dirent *dirp, @@ -1569,6 +1624,20 @@ int smbc_getdents(unsigned int dh, struct smbc_dirent *dirp, int count); */ struct smbc_dirent* smbc_readdir(unsigned int dh); +/**@ingroup directory + * Works similar as smbc_readdir but returns more information about file. + * + * @param dh Valid directory as returned by smbc_opendir() + * + * @return A pointer to a libsmb_file_info structure, or NULL if an + * error occurs or end-of-directory is reached: + * - EBADF Invalid directory handle + * - EINVAL smbc_init() failed or has not been called + * + * @see smbc_open(), smbc_readdir() + */ +struct libsmb_file_info *smbc_readdirplus(unsigned int dh); + /**@ingroup directory * Get the current directory offset. @@ -3018,6 +3087,7 @@ struct _SMBCCTX smbc_opendir_fn opendir DEPRECATED_SMBC_INTERFACE; smbc_closedir_fn closedir DEPRECATED_SMBC_INTERFACE; smbc_readdir_fn readdir DEPRECATED_SMBC_INTERFACE; + smbc_readdirplus_fn readdirplus DEPRECATED_SMBC_INTERFACE; smbc_getdents_fn getdents DEPRECATED_SMBC_INTERFACE; smbc_mkdir_fn mkdir DEPRECATED_SMBC_INTERFACE; smbc_rmdir_fn rmdir DEPRECATED_SMBC_INTERFACE; diff --git a/source3/libsmb/ABI/smbclient-0.3.3.sigs b/source3/libsmb/ABI/smbclient-0.3.3.sigs new file mode 100644 index 00000000000..c91fe6f1071 --- /dev/null +++ b/source3/libsmb/ABI/smbclient-0.3.3.sigs @@ -0,0 +1,184 @@ +smbc_chmod: int (const char *, mode_t) +smbc_close: int (int) +smbc_closedir: int (int) +smbc_creat: int (const char *, mode_t) +smbc_fgetxattr: int (int, const char *, const void *, size_t) +smbc_flistxattr: int (int, char *, size_t) +smbc_free_context: int (SMBCCTX *, int) +smbc_fremovexattr: int (int, const char *) +smbc_fsetxattr: int (int, const char *, const void *, size_t, int) +smbc_fstat: int (int, struct stat *) +smbc_fstatvfs: int (int, struct statvfs *) +smbc_ftruncate: int (int, off_t) +smbc_getDebug: int (SMBCCTX *) +smbc_getFunctionAddCachedServer: smbc_add_cached_srv_fn (SMBCCTX *) +smbc_getFunctionAuthData: smbc_get_auth_data_fn (SMBCCTX *) +smbc_getFunctionAuthDataWithContext: smbc_get_auth_data_with_context_fn (SMBCCTX *) +smbc_getFunctionCheckServer: smbc_check_server_fn (SMBCCTX *) +smbc_getFunctionChmod: smbc_chmod_fn (SMBCCTX *) +smbc_getFunctionClose: smbc_close_fn (SMBCCTX *) +smbc_getFunctionClosedir: smbc_closedir_fn (SMBCCTX *) +smbc_getFunctionCreat: smbc_creat_fn (SMBCCTX *) +smbc_getFunctionFstat: smbc_fstat_fn (SMBCCTX *) +smbc_getFunctionFstatVFS: smbc_fstatvfs_fn (SMBCCTX *) +smbc_getFunctionFstatdir: smbc_fstatdir_fn (SMBCCTX *) +smbc_getFunctionFtruncate: smbc_ftruncate_fn (SMBCCTX *) +smbc_getFunctionGetCachedServer: smbc_get_cached_srv_fn (SMBCCTX *) +smbc_getFunctionGetdents: smbc_getdents_fn (SMBCCTX *) +smbc_getFunctionGetxattr: smbc_getxattr_fn (SMBCCTX *) +smbc_getFunctionListPrintJobs: smbc_list_print_jobs_fn (SMBCCTX *) +smbc_getFunctionListxattr: smbc_listxattr_fn (SMBCCTX *) +smbc_getFunctionLseek: smbc_lseek_fn (SMBCCTX *) +smbc_getFunctionLseekdir: smbc_lseekdir_fn (SMBCCTX *) +smbc_getFunctionMkdir: smbc_mkdir_fn (SMBCCTX *) +smbc_getFunctionNotify: smbc_notify_fn (SMBCCTX *) +smbc_getFunctionOpen: smbc_open_fn (SMBCCTX *) +smbc_getFunctionOpenPrintJob: smbc_open_print_job_fn (SMBCCTX *) +smbc_getFunctionOpendir: smbc_opendir_fn (SMBCCTX *) +smbc_getFunctionPrintFile: smbc_print_file_fn (SMBCCTX *) +smbc_getFunctionPurgeCachedServers: smbc_purge_cached_fn (SMBCCTX *) +smbc_getFunctionRead: smbc_read_fn (SMBCCTX *) +smbc_getFunctionReaddir: smbc_readdir_fn (SMBCCTX *) +smbc_getFunctionReaddirPlus: smbc_readdirplus_fn (SMBCCTX *) +smbc_getFunctionRemoveCachedServer: smbc_remove_cached_srv_fn (SMBCCTX *) +smbc_getFunctionRemoveUnusedServer: smbc_remove_unused_server_fn (SMBCCTX *) +smbc_getFunctionRemovexattr: smbc_removexattr_fn (SMBCCTX *) +smbc_getFunctionRename: smbc_rename_fn (SMBCCTX *) +smbc_getFunctionRmdir: smbc_rmdir_fn (SMBCCTX *) +smbc_getFunctionSetxattr: smbc_setxattr_fn (SMBCCTX *) +smbc_getFunctionSplice: smbc_splice_fn (SMBCCTX *) +smbc_getFunctionStat: smbc_stat_fn (SMBCCTX *) +smbc_getFunctionStatVFS: smbc_statvfs_fn (SMBCCTX *) +smbc_getFunctionTelldir: smbc_telldir_fn (SMBCCTX *) +smbc_getFunctionUnlink: smbc_unlink_fn (SMBCCTX *) +smbc_getFunctionUnlinkPrintJob: smbc_unlink_print_job_fn (SMBCCTX *) +smbc_getFunctionUtimes: smbc_utimes_fn (SMBCCTX *) +smbc_getFunctionWrite: smbc_write_fn (SMBCCTX *) +smbc_getNetbiosName: char *(SMBCCTX *) +smbc_getOptionBrowseMaxLmbCount: int (SMBCCTX *) +smbc_getOptionCaseSensitive: smbc_bool (SMBCCTX *) +smbc_getOptionDebugToStderr: smbc_bool (SMBCCTX *) +smbc_getOptionFallbackAfterKerberos: smbc_bool (SMBCCTX *) +smbc_getOptionFullTimeNames: smbc_bool (SMBCCTX *) +smbc_getOptionNoAutoAnonymousLogin: smbc_bool (SMBCCTX *) +smbc_getOptionOneSharePerServer: smbc_bool (SMBCCTX *) +smbc_getOptionOpenShareMode: smbc_share_mode (SMBCCTX *) +smbc_getOptionSmbEncryptionLevel: smbc_smb_encrypt_level (SMBCCTX *) +smbc_getOptionUrlEncodeReaddirEntries: smbc_bool (SMBCCTX *) +smbc_getOptionUseCCache: smbc_bool (SMBCCTX *) +smbc_getOptionUseKerberos: smbc_bool (SMBCCTX *) +smbc_getOptionUseNTHash: smbc_bool (SMBCCTX *) +smbc_getOptionUserData: void *(SMBCCTX *) +smbc_getPort: uint16_t (SMBCCTX *) +smbc_getServerCacheData: struct smbc_server_cache *(SMBCCTX *) +smbc_getTimeout: int (SMBCCTX *) +smbc_getUser: char *(SMBCCTX *) +smbc_getWorkgroup: char *(SMBCCTX *) +smbc_getdents: int (unsigned int, struct smbc_dirent *, int) +smbc_getxattr: int (const char *, const char *, const void *, size_t) +smbc_init: int (smbc_get_auth_data_fn, int) +smbc_init_context: SMBCCTX *(SMBCCTX *) +smbc_lgetxattr: int (const char *, const char *, const void *, size_t) +smbc_list_print_jobs: int (const char *, smbc_list_print_job_fn) +smbc_listxattr: int (const char *, char *, size_t) +smbc_llistxattr: int (const char *, char *, size_t) +smbc_lremovexattr: int (const char *, const char *) +smbc_lseek: off_t (int, off_t, int) +smbc_lseekdir: int (int, off_t) +smbc_lsetxattr: int (const char *, const char *, const void *, size_t, int) +smbc_mkdir: int (const char *, mode_t) +smbc_new_context: SMBCCTX *(void) +smbc_notify: int (int, smbc_bool, uint32_t, unsigned int, smbc_notify_callback_fn, void *) +smbc_open: int (const char *, int, mode_t) +smbc_open_print_job: int (const char *) +smbc_opendir: int (const char *) +smbc_option_get: void *(SMBCCTX *, char *) +smbc_option_set: void (SMBCCTX *, char *, ...) +smbc_print_file: int (const char *, const char *) +smbc_read: ssize_t (int, void *, size_t) +smbc_readdir: struct smbc_dirent *(unsigned int) +smbc_readdirplus: struct libsmb_file_info *(unsigned int) +smbc_removexattr: int (const char *, const char *) +smbc_rename: int (const char *, const char *) +smbc_rmdir: int (const char *) +smbc_setConfiguration: int (SMBCCTX *, const char *) +smbc_setDebug: void (SMBCCTX *, int) +smbc_setFunctionAddCachedServer: void (SMBCCTX *, smbc_add_cached_srv_fn) +smbc_setFunctionAuthData: void (SMBCCTX *, smbc_get_auth_data_fn) +smbc_setFunctionAuthDataWithContext: void (SMBCCTX *, smbc_get_auth_data_with_context_fn) +smbc_setFunctionCheckServer: void (SMBCCTX *, smbc_check_server_fn) +smbc_setFunctionChmod: void (SMBCCTX *, smbc_chmod_fn) +smbc_setFunctionClose: void (SMBCCTX *, smbc_close_fn) +smbc_setFunctionClosedir: void (SMBCCTX *, smbc_closedir_fn) +smbc_setFunctionCreat: void (SMBCCTX *, smbc_creat_fn) +smbc_setFunctionFstat: void (SMBCCTX *, smbc_fstat_fn) +smbc_setFunctionFstatVFS: void (SMBCCTX *, smbc_fstatvfs_fn) +smbc_setFunctionFstatdir: void (SMBCCTX *, smbc_fstatdir_fn) +smbc_setFunctionFtruncate: void (SMBCCTX *, smbc_ftruncate_fn) +smbc_setFunctionGetCachedServer: void (SMBCCTX *, smbc_get_cached_srv_fn) +smbc_setFunctionGetdents: void (SMBCCTX *, smbc_getdents_fn) +smbc_setFunctionGetxattr: void (SMBCCTX *, smbc_getxattr_fn) +smbc_setFunctionListPrintJobs: void (SMBCCTX *, smbc_list_print_jobs_fn) +smbc_setFunctionListxattr: void (SMBCCTX *, smbc_listxattr_fn) +smbc_setFunctionLseek: void (SMBCCTX *, smbc_lseek_fn) +smbc_setFunctionLseekdir: void (SMBCCTX *, smbc_lseekdir_fn) +smbc_setFunctionMkdir: void (SMBCCTX *, smbc_mkdir_fn) +smbc_setFunctionNotify: void (SMBCCTX *, smbc_notify_fn) +smbc_setFunctionOpen: void (SMBCCTX *, smbc_open_fn) +smbc_setFunctionOpenPrintJob: void (SMBCCTX *, smbc_open_print_job_fn) +smbc_setFunctionOpendir: void (SMBCCTX *, smbc_opendir_fn) +smbc_setFunctionPrintFile: void (SMBCCTX *, smbc_print_file_fn) +smbc_setFunctionPurgeCachedServers: void (SMBCCTX *, smbc_purge_cached_fn) +smbc_setFunctionRead: void (SMBCCTX *, smbc_read_fn) +smbc_setFunctionReaddir: void (SMBCCTX *, smbc_readdir_fn) +smbc_setFunctionReaddirPlus: void (SMBCCTX *, smbc_readdirplus_fn) +smbc_setFunctionRemoveCachedServer: void (SMBCCTX *, smbc_remove_cached_srv_fn) +smbc_setFunctionRemoveUnusedServer: void (SMBCCTX *, smbc_remove_unused_server_fn) +smbc_setFunctionRemovexattr: void (SMBCCTX *, smbc_removexattr_fn) +smbc_setFunctionRename: void (SMBCCTX *, smbc_rename_fn) +smbc_setFunctionRmdir: void (SMBCCTX *, smbc_rmdir_fn) +smbc_setFunctionSetxattr: void (SMBCCTX *, smbc_setxattr_fn) +smbc_setFunctionSplice: void (SMBCCTX *, smbc_splice_fn) +smbc_setFunctionStat: void (SMBCCTX *, smbc_stat_fn) +smbc_setFunctionStatVFS: void (SMBCCTX *, smbc_statvfs_fn) +smbc_setFunctionTelldir: void (SMBCCTX *, smbc_telldir_fn) +smbc_setFunctionUnlink: void (SMBCCTX *, smbc_unlink_fn) +smbc_setFunctionUnlinkPrintJob: void (SMBCCTX *, smbc_unlink_print_job_fn) +smbc_setFunctionUtimes: void (SMBCCTX *, smbc_utimes_fn) +smbc_setFunctionWrite: void (SMBCCTX *, smbc_write_fn) +smbc_setLogCallback: void (SMBCCTX *, void *, smbc_debug_callback_fn) +smbc_setNetbiosName: void (SMBCCTX *, char *) +smbc_setOptionBrowseMaxLmbCount: void (SMBCCTX *, int) +smbc_setOptionCaseSensitive: void (SMBCCTX *, smbc_bool) +smbc_setOptionDebugToStderr: void (SMBCCTX *, smbc_bool) +smbc_setOptionFallbackAfterKerberos: void (SMBCCTX *, smbc_bool) +smbc_setOptionFullTimeNames: void (SMBCCTX *, smbc_bool) +smbc_setOptionNoAutoAnonymousLogin: void (SMBCCTX *, smbc_bool) +smbc_setOptionOneSharePerServer: void (SMBCCTX *, smbc_bool) +smbc_setOptionOpenShareMode: void (SMBCCTX *, smbc_share_mode) +smbc_setOptionSmbEncryptionLevel: void (SMBCCTX *, smbc_smb_encrypt_level) +smbc_setOptionUrlEncodeReaddirEntries: void (SMBCCTX *, smbc_bool) +smbc_setOptionUseCCache: void (SMBCCTX *, smbc_bool) +smbc_setOptionUseKerberos: void (SMBCCTX *, smbc_bool) +smbc_setOptionUseNTHash: void (SMBCCTX *, smbc_bool) +smbc_setOptionUserData: void (SMBCCTX *, void *) +smbc_setPort: void (SMBCCTX *, uint16_t) +smbc_setServerCacheData: void (SMBCCTX *, struct smbc_server_cache *) +smbc_setTimeout: void (SMBCCTX *, int) +smbc_setUser: void (SMBCCTX *, const char *) +smbc_setWorkgroup: void (SMBCCTX *, char *) +smbc_set_context: SMBCCTX *(SMBCCTX *) +smbc_set_credentials: void (const char *, const char *, const char *, smbc_bool, const char *) +smbc_set_credentials_with_fallback: void (SMBCCTX *, const char *, const char *, const char *) +smbc_setxattr: int (const char *, const char *, const void *, size_t, int) +smbc_stat: int (const char *, struct stat *) +smbc_statvfs: int (char *, struct statvfs *) +smbc_telldir: off_t (int) +smbc_unlink: int (const char *) +smbc_unlink_print_job: int (const char *, int) +smbc_urldecode: int (char *, char *, size_t) +smbc_urlencode: int (char *, char *, int) +smbc_utime: int (const char *, struct utimbuf *) +smbc_utimes: int (const char *, struct timeval *) +smbc_version: const char *(void) +smbc_write: ssize_t (int, const void *, size_t) diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c index 2d87b58d730..bf686dad3d6 100644 --- a/source3/libsmb/cli_smb2_fnum.c +++ b/source3/libsmb/cli_smb2_fnum.c @@ -803,6 +803,7 @@ static NTSTATUS parse_finfo_id_both_directory_info(uint8_t *dir_data, return NT_STATUS_INFO_LENGTH_MISMATCH; } + finfo->btime_ts = interpret_long_date((const char *)dir_data + 8); finfo->atime_ts = interpret_long_date((const char *)dir_data + 16); finfo->mtime_ts = interpret_long_date((const char *)dir_data + 24); finfo->ctime_ts = interpret_long_date((const char *)dir_data + 32); diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index 41f585120b9..8363186ad8b 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -171,6 +171,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx, p += 4; /* fileindex */ /* Offset zero is "create time", not "change time". */ + finfo->btime_ts = interpret_long_date(p); p += 8; finfo->atime_ts = interpret_long_date(p); p += 8; diff --git a/source3/libsmb/libsmb_compat.c b/source3/libsmb/libsmb_compat.c index 5fed44abc4a..2266e6f1002 100644 --- a/source3/libsmb/libsmb_compat.c +++ b/source3/libsmb/libsmb_compat.c @@ -285,6 +285,13 @@ smbc_readdir(unsigned int dh) return smbc_getFunctionReaddir(statcont)(statcont, file); } +struct libsmb_file_info *smbc_readdirplus(unsigned int dh) +{ + SMBCFILE * file = find_fd(dh); + return smbc_getFunctionReaddirPlus(statcont)(statcont, file); +} + + off_t smbc_telldir(int dh) { diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index b55cf1e2d15..932223c9b2f 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -208,6 +208,7 @@ smbc_new_context(void) smbc_setFunctionOpendir(context, SMBC_opendir_ctx); smbc_setFunctionClosedir(context, SMBC_closedir_ctx); smbc_setFunctionReaddir(context, SMBC_readdir_ctx); + smbc_setFunctionReaddirPlus(context, SMBC_readdirplus_ctx); smbc_setFunctionGetdents(context, SMBC_getdents_ctx); smbc_setFunctionMkdir(context, SMBC_mkdir_ctx); smbc_setFunctionRmdir(context, SMBC_rmdir_ctx); diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index 72441c46736..4623ea26491 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -39,6 +39,83 @@ * We accept the URL syntax explained in SMBC_parse_path(), above. */ +static void +remove_dirplus(SMBCFILE *dir) +{ + struct smbc_dirplus_list *d, *f; + + d = dir->dirplus_list; + while (d) { + f = d; + d = d->next; + + SAFE_FREE(f->data->short_name); + SAFE_FREE(f->data->name); + SAFE_FREE(f->data); + SAFE_FREE(f); + } + + dir->dirplus_list = dir->dirplus_end = dir->dirplus_next = NULL; +} + +static int +add_fileinfo(SMBCFILE *dir, + struct file_info *finfo) +{ + struct libsmb_file_info *info; + + info = SMB_MALLOC_P(struct libsmb_file_info); + if (!info) { + dir->dir_error = ENOMEM; + return -1; + } + + ZERO_STRUCTP(info); + + if (dir->dirplus_list == NULL) { + dir->dirplus_list = SMB_MALLOC_P(struct smbc_dirplus_list); + if (!dir->dirplus_list) { + SAFE_FREE(info); + dir->dir_error = ENOMEM; + return -1; + } + ZERO_STRUCTP(dir->dirplus_list); + + dir->dirplus_end = dir->dirplus_next = dir->dirplus_list; + } else { + dir->dirplus_end->next = SMB_MALLOC_P(struct smbc_dirplus_list); + if (!dir->dirplus_end->next) { + SAFE_FREE(info); + dir->dir_error = ENOMEM; + return -1; + + } + ZERO_STRUCTP(dir->dirplus_end->next); + + dir->dirplus_end = dir->dirplus_end->next; + } + + dir->dirplus_end->next = NULL; + dir->dirplus_end->data = info; + + info->btime_ts = finfo->btime_ts; + info->atime_ts = finfo->atime_ts; + info->ctime_ts = finfo->ctime_ts; + info->mtime_ts = finfo->mtime_ts; + info->gid = finfo->gid; + info->mode = finfo->mode; + info->size = finfo->size; + info->uid = finfo->uid; + info->name = SMB_STRDUP(finfo->name); + if (finfo->short_name) { + info->short_name = SMB_STRDUP(finfo->short_name); + } else { + info->short_name = SMB_STRDUP(""); + } + + return 0; +} + static void remove_dir(SMBCFILE *dir) { @@ -253,6 +330,10 @@ dir_list_fn(const char *mnt, SMBCFILE *dir = (SMBCFILE *)state; return map_nt_error_from_unix(dir->dir_error); } + if (add_fileinfo((SMBCFILE *) state, finfo) < 0) { + SMBCFILE *dir = (SMBCFILE *) state; + return map_nt_error_from_unix(dir->dir_error); + } return NT_STATUS_OK; } @@ -456,6 +537,7 @@ SMBC_opendir_ctx(SMBCCTX *context, dir->offset = 0; dir->file = False; dir->dir_list = dir->dir_next = dir->dir_end = NULL; + dir->dirplus_list = dir->dirplus_next = dir->dirplus_end = NULL; if (server[0] == (char)0) { @@ -928,7 +1010,9 @@ SMBC_closedir_ctx(SMBCCTX *context, return -1; } - remove_dir(dir); /* Clean it up */ + /* Clean it up */ + remove_dir(dir); + remove_dirplus(dir); DLIST_REMOVE(context->internal->files, dir); @@ -1045,6 +1129,51 @@ SMBC_readdir_ctx(SMBCCTX *context, return dirp; } +/* + * Routine to get a directory entry with all attributes + */ + +struct libsmb_file_info * +SMBC_readdirplus_ctx(SMBCCTX *context, + SMBCFILE *dir) +{ + struct libsmb_file_info *finfo; + TALLOC_CTX *frame = talloc_stackframe(); + + /* Check that all is ok first ... */ + + if (!context || !context->internal->initialized) { + DBG_ERR("Invalid context in SMBC_readdirplus_ctx()\n"); + TALLOC_FREE(frame); + errno = EINVAL; + return NULL; + } + + if (!dir || !SMBC_dlist_contains(context->internal->files, dir)) { + DBG_ERR("Invalid dir in SMBC_readdirplus_ctx()\n"); + TALLOC_FREE(frame); + errno = EBADF; + return NULL; + } + + if (!dir->dirplus_next) { + TALLOC_FREE(frame); + return NULL; + } + + finfo = dir->dirplus_next->data; + if (!finfo) { + TALLOC_FREE(frame); + errno = ENOENT; + return NULL; + } + dir->dirplus_next = dir->dirplus_next->next; + + TALLOC_FREE(frame); + return finfo; +} + + /* * Routine to get directory entries */ diff --git a/source3/libsmb/libsmb_setget.c b/source3/libsmb/libsmb_setget.c index cb32f5fc20e..5af78b4257b 100644 --- a/source3/libsmb/libsmb_setget.c +++ b/source3/libsmb/libsmb_setget.c @@ -879,6 +879,16 @@ smbc_setFunctionReaddir(SMBCCTX *c, smbc_readdir_fn fn) c->readdir = fn; } +smbc_readdirplus_fn smbc_getFunctionReaddirPlus(SMBCCTX *c) +{ + return c->readdirplus; +} + +void smbc_setFunctionReaddirPlus(SMBCCTX *c, smbc_readdirplus_fn fn) +{ + c->readdirplus = fn; +} + smbc_getdents_fn smbc_getFunctionGetdents(SMBCCTX *c) { diff --git a/source3/libsmb/wscript b/source3/libsmb/wscript index 526434eabe0..15575bcc6ab 100644 --- a/source3/libsmb/wscript +++ b/source3/libsmb/wscript @@ -27,5 +27,5 @@ def build(bld): public_headers='../include/libsmbclient.h', abi_directory='ABI', abi_match='smbc_*', - vnum='0.3.2', + vnum='0.3.3', pc_files='smbclient.pc') diff --git a/source4/torture/libsmbclient/libsmbclient.c b/source4/torture/libsmbclient/libsmbclient.c index 00e766c488a..e165b5e4e8b 100644 --- a/source4/torture/libsmbclient/libsmbclient.c +++ b/source4/torture/libsmbclient/libsmbclient.c @@ -223,6 +223,59 @@ static bool torture_libsmbclient_opendir(struct torture_context *tctx) return ret; } +static bool test_readdirplus(struct torture_context *tctx, + SMBCCTX *ctx, + const char *fname) +{ + int handle, ret, i; + struct libsmb_file_info *info = NULL; + torture_comment(tctx, "Testing smbc_readdirplus(%s)\n", fname); + + handle = smbc_opendir(fname); + if (handle < 0) { + torture_fail(tctx, talloc_asprintf(tctx, "failed to obain file handle for '%s'", fname)); + } + + /* we should have at-least 2 entries here, '.' and '..' */ + for(i = 0; i < 2; ++i) + { + info = smbc_readdirplus(handle); + torture_assert(tctx, info, "smbc_readdirplus failed, info is NULL"); + torture_assert(tctx, info->name, "smbc_readdirplus failed, name not found"); + torture_assert(tctx, info->mode & 0x0010L,"smbc_readdirplus failed, not a directory"); // 0x0010L = FILE_ATTRIBUTE_DIRECTORY + torture_assert_int_equal(tctx, info->size, 0, "smbc_readdirplus failed, size should be 0 for directory"); + + } + ret = smbc_closedir(handle); + torture_assert_int_equal(tctx, ret, 0, + talloc_asprintf(tctx, "failed to close file handle for '%s'", fname)); + + return true; +} + +static bool torture_libsmbclient_readdirplus(struct torture_context *tctx) +{ + int i; + SMBCCTX *ctx; + + const char *urls[] = { + "smb://", + "smb://WORKGROUP", + "smb://WORKGROUP/" + }; + + torture_assert(tctx, torture_libsmbclient_init_context(tctx, &ctx), ""); + smbc_set_context(ctx); + + for (i=0; i < ARRAY_SIZE(urls); i++) { + test_readdirplus(tctx, ctx, urls[i]); + } + + smbc_free_context(ctx, 1); + + return true; +} + /* note the strdup for string options on smbc_set calls. I think libsmbclient is * really doing something wrong here: in smbc_free_context libsmbclient just * calls free() on the string options so it assumes the callers have malloced @@ -298,6 +351,7 @@ NTSTATUS torture_libsmbclient_init(TALLOC_CTX *ctx) torture_suite_add_simple_test(suite, "setConfiguration", torture_libsmbclient_setConfiguration); torture_suite_add_simple_test(suite, "options", torture_libsmbclient_options); torture_suite_add_simple_test(suite, "opendir", torture_libsmbclient_opendir); + torture_suite_add_simple_test(suite, "readdirplus", torture_libsmbclient_readdirplus); suite->description = talloc_strdup(suite, "libsmbclient interface tests"); From 9b0537955a45870b4bad52bced24b95c9bb4804a Mon Sep 17 00:00:00 2001 From: Jones Syue Date: Fri, 30 Mar 2018 08:31:06 +0800 Subject: [PATCH 02/64] s4:torture: kernel oplocks. Fix assertion warning Simply boolean 'ret' instead of 'ret = true'. Signed-off-by: Jones Syue Reviewed-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Fri Mar 30 18:39:19 CEST 2018 on sn-devel-144 --- source4/torture/smb2/oplock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c index 87d7d2ff946..cb1b5edddfe 100644 --- a/source4/torture/smb2/oplock.c +++ b/source4/torture/smb2/oplock.c @@ -5032,7 +5032,7 @@ static bool test_smb2_kernel_oplocks8(struct torture_context *tctx, /* Take the oplock locally in a sub-process. */ ret = wait_for_child_oplock(tctx, localdir, fname); - torture_assert_goto(tctx, ret = true, ret, done, + torture_assert_goto(tctx, ret, ret, done, "Wait for child process failed.\n"); /* From 2152608260e8ed45ef55ee1941c8599210e0540f Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Tue, 13 Mar 2018 09:06:45 +0100 Subject: [PATCH 03/64] ctdb: Fixing possible memory leak in ctdb_daemon_read_cb In case of an error condition the further processing of the data is cancelled and the callback returns. In such a scenario the data has to be free'd. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/server/ctdb_daemon.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 7665e2a29c3..6d2f70f99b6 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -903,12 +903,12 @@ static void ctdb_daemon_read_cb(uint8_t *data, size_t cnt, void *args) if (hdr->ctdb_magic != CTDB_MAGIC) { ctdb_set_error(client->ctdb, "Non CTDB packet rejected\n"); - return; + goto err_out; } if (hdr->ctdb_version != CTDB_PROTOCOL) { ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected in daemon\n", hdr->ctdb_version); - return; + goto err_out; } DEBUG(DEBUG_DEBUG,(__location__ " client request %u of type %u length %u from " @@ -917,6 +917,10 @@ static void ctdb_daemon_read_cb(uint8_t *data, size_t cnt, void *args) /* it is the responsibility of the incoming packet function to free 'data' */ daemon_incoming_packet(client, hdr); + return; + +err_out: + TALLOC_FREE(data); } From 330b7737c25a36d6a8e7e2eb074a5af5d575c8c7 Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Tue, 13 Mar 2018 09:42:24 +0100 Subject: [PATCH 04/64] ctdb: Fixing memory leak in ctdb_tcp_tnode_cb It is expected by the caller(queue_process) that the callback is free'ing the memory referenced by the data pointer. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/tcp/tcp_connect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c index 17aafc415f7..13452a5e83b 100644 --- a/ctdb/tcp/tcp_connect.c +++ b/ctdb/tcp/tcp_connect.c @@ -75,6 +75,7 @@ void ctdb_tcp_tnode_cb(uint8_t *data, size_t cnt, void *private_data) tnode->connect_te = tevent_add_timer(node->ctdb->ev, tnode, timeval_current_ofs(3, 0), ctdb_tcp_node_connect, node); + TALLOC_FREE(data); } /* From cf33264176d7210ca1b9d8cfca5ed38b47907da4 Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Tue, 13 Mar 2018 09:34:52 +0100 Subject: [PATCH 05/64] ctdb: Fixing possible memory leak in ctdb_tcp_read_cb In case of an error condition the further processing of the data is cancelled and the callback returns. In such a scenario the data has to be free'd. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/tcp/tcp_io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ctdb/tcp/tcp_io.c b/ctdb/tcp/tcp_io.c index 5bb4b5bd1a7..3c3b1c167f3 100644 --- a/ctdb/tcp/tcp_io.c +++ b/ctdb/tcp/tcp_io.c @@ -80,7 +80,8 @@ void ctdb_tcp_read_cb(uint8_t *data, size_t cnt, void *args) return; failed: - talloc_free(in); + TALLOC_FREE(in); + TALLOC_FREE(data); } /* From e3a1b7f9012dda8435c603feb2211c4f32e96569 Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Wed, 21 Feb 2018 13:34:28 +0100 Subject: [PATCH 06/64] ctdb: Use provided mem_ctx for newly allocated memory ctdb_call_local is called with a mem_ctx parameter which should be used for newly allocated memory. This is safe because all allocations of this context are freed before this function returns. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/client/ctdb_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index d399cb551f6..c3bb435a641 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -86,7 +86,7 @@ int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *call, struct ctdb_registered_call *fn; struct ctdb_context *ctdb = ctdb_db->ctdb; - c = talloc(ctdb, struct ctdb_call_info); + c = talloc(mem_ctx, struct ctdb_call_info); CTDB_NO_MEMORY(ctdb, c); c->key = call->key; From 13f94da1e4c70acd334bb239bf0b2abe417a16ca Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Wed, 21 Feb 2018 13:52:11 +0100 Subject: [PATCH 07/64] ctdb: Use talloc_zero instead of zeroing attributes Zero entire structure with talloc_zero on memory allocation instead of setting each attribute individually. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/client/ctdb_client.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index c3bb435a641..a7624b7e3c8 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -86,7 +86,7 @@ int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *call, struct ctdb_registered_call *fn; struct ctdb_context *ctdb = ctdb_db->ctdb; - c = talloc(mem_ctx, struct ctdb_call_info); + c = talloc_zero(mem_ctx, struct ctdb_call_info); CTDB_NO_MEMORY(ctdb, c); c->key = call->key; @@ -94,9 +94,6 @@ int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *call, c->record_data.dptr = talloc_memdup(c, data->dptr, data->dsize); c->record_data.dsize = data->dsize; CTDB_NO_MEMORY(ctdb, c->record_data.dptr); - c->new_data = NULL; - c->reply_data = NULL; - c->status = 0; c->header = header; for (fn=ctdb_db->calls;fn;fn=fn->next) { From 95babfe912e5c25c8957cf01221acc4d67d4643e Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Thu, 8 Feb 2018 11:33:08 +0100 Subject: [PATCH 08/64] ctdb-server: Cleanup ctdb_daemon_call_send_remote Minor code cleanup and adding a temporary variable to improve readabilty. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/server/ctdb_call.c | 54 +++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index 17d6f98e37c..836d615d3c2 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -1464,6 +1464,7 @@ struct ctdb_call_state *ctdb_daemon_call_send_remote(struct ctdb_db_context *ctd uint32_t len; struct ctdb_call_state *state; struct ctdb_context *ctdb = ctdb_db->ctdb; + struct ctdb_req_call_old *c; if (ctdb->methods == NULL) { DEBUG(DEBUG_INFO,(__location__ " Failed send packet. Transport is down\n")); @@ -1479,31 +1480,40 @@ struct ctdb_call_state *ctdb_daemon_call_send_remote(struct ctdb_db_context *ctd state->ctdb_db = ctdb_db; talloc_set_destructor(state, ctdb_call_destructor); - len = offsetof(struct ctdb_req_call_old, data) + call->key.dsize + call->call_data.dsize; - state->c = ctdb_transport_allocate(ctdb, state, CTDB_REQ_CALL, len, - struct ctdb_req_call_old); - CTDB_NO_MEMORY_NULL(ctdb, state->c); - state->c->hdr.destnode = header->dmaster; - - /* this limits us to 16k outstanding messages - not unreasonable */ - state->c->hdr.reqid = state->reqid; - state->c->hdr.generation = ctdb_db->generation; - state->c->flags = call->flags; - state->c->db_id = ctdb_db->db_id; - state->c->callid = call->call_id; - state->c->hopcount = 0; - state->c->keylen = call->key.dsize; - state->c->calldatalen = call->call_data.dsize; - memcpy(&state->c->data[0], call->key.dptr, call->key.dsize); - memcpy(&state->c->data[call->key.dsize], - call->call_data.dptr, call->call_data.dsize); - *(state->call) = *call; - state->call->call_data.dptr = &state->c->data[call->key.dsize]; - state->call->key.dptr = &state->c->data[0]; - state->state = CTDB_CALL_WAIT; state->generation = ctdb_db->generation; + len = offsetof(struct ctdb_req_call_old, data) + call->key.dsize + + call->call_data.dsize; + + c = ctdb_transport_allocate(ctdb, + state, + CTDB_REQ_CALL, + len, + struct ctdb_req_call_old); + + CTDB_NO_MEMORY_NULL(ctdb, c); + state->c = c; + + c->hdr.destnode = header->dmaster; + c->hdr.reqid = state->reqid; + c->hdr.generation = ctdb_db->generation; + c->flags = call->flags; + c->db_id = ctdb_db->db_id; + c->callid = call->call_id; + c->hopcount = 0; + c->keylen = call->key.dsize; + c->calldatalen = call->call_data.dsize; + + memcpy(&c->data[0], call->key.dptr, call->key.dsize); + memcpy(&c->data[call->key.dsize], + call->call_data.dptr, + call->call_data.dsize); + + *(state->call) = *call; + state->call->call_data.dptr = &c->data[call->key.dsize]; + state->call->key.dptr = &c->data[0]; + DLIST_ADD(ctdb_db->pending_calls, state); ctdb_queue_packet(ctdb, &state->c->hdr); From dedcff058d39ce7b703fb3e94990f3215e608197 Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Tue, 20 Feb 2018 17:08:59 +0100 Subject: [PATCH 09/64] ctdb-server: Only talloc_set_destructor when required The destructor is only needed once the state got added to the DLIST. Therefore, move the setting of the destructor to after the addition of state to the DLIST. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/server/ctdb_call.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index 836d615d3c2..ee16a075a69 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -1478,8 +1478,6 @@ struct ctdb_call_state *ctdb_daemon_call_send_remote(struct ctdb_db_context *ctd state->reqid = reqid_new(ctdb->idr, state); state->ctdb_db = ctdb_db; - talloc_set_destructor(state, ctdb_call_destructor); - state->state = CTDB_CALL_WAIT; state->generation = ctdb_db->generation; @@ -1516,6 +1514,7 @@ struct ctdb_call_state *ctdb_daemon_call_send_remote(struct ctdb_db_context *ctd DLIST_ADD(ctdb_db->pending_calls, state); + talloc_set_destructor(state, ctdb_call_destructor); ctdb_queue_packet(ctdb, &state->c->hdr); return state; From b390a6c910a7da91901a7908e16c01aad1321008 Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Wed, 31 Jan 2018 13:06:30 +0100 Subject: [PATCH 10/64] ctdb-server: Replace the variable rc by something meaningful Replace the varibale name "rc" in ctdb_start_revoke_ro_record to prevent a mix-up with the common meaning of rc (return code). Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/server/ctdb_call.c | 143 ++++++++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 66 deletions(-) diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index ee16a075a69..0fd35c90b78 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -1558,7 +1558,7 @@ struct revokechild_deferred_call { struct ctdb_req_header *hdr; deferred_requeue_fn fn; void *ctx; - struct revokechild_handle *rc; + struct revokechild_handle *rev_hdl; }; struct revokechild_handle { @@ -1592,36 +1592,36 @@ static void deferred_call_requeue(struct tevent_context *ev, static int deferred_call_destructor(struct revokechild_deferred_call *dcall) { - struct revokechild_handle *rc = dcall->rc; + struct revokechild_handle *rev_hdl = dcall->rev_hdl; - DLIST_REMOVE(rc->deferred_call_list, dcall); + DLIST_REMOVE(rev_hdl->deferred_call_list, dcall); return 0; } -static int revokechild_destructor(struct revokechild_handle *rc) +static int revokechild_destructor(struct revokechild_handle *rev_hdl) { struct revokechild_deferred_call *now_list = NULL; struct revokechild_deferred_call *delay_list = NULL; - if (rc->fde != NULL) { - talloc_free(rc->fde); + if (rev_hdl->fde != NULL) { + talloc_free(rev_hdl->fde); } - if (rc->fd[0] != -1) { - close(rc->fd[0]); + if (rev_hdl->fd[0] != -1) { + close(rev_hdl->fd[0]); } - if (rc->fd[1] != -1) { - close(rc->fd[1]); + if (rev_hdl->fd[1] != -1) { + close(rev_hdl->fd[1]); } - ctdb_kill(rc->ctdb, rc->child, SIGKILL); + ctdb_kill(rev_hdl->ctdb, rev_hdl->child, SIGKILL); - DLIST_REMOVE(rc->ctdb_db->revokechild_active, rc); + DLIST_REMOVE(rev_hdl->ctdb_db->revokechild_active, rev_hdl); - while (rc->deferred_call_list != NULL) { + while (rev_hdl->deferred_call_list != NULL) { struct revokechild_deferred_call *dcall; - dcall = rc->deferred_call_list; - DLIST_REMOVE(rc->deferred_call_list, dcall); + dcall = rev_hdl->deferred_call_list; + DLIST_REMOVE(rev_hdl->deferred_call_list, dcall); /* If revoke is successful, then first process all the calls * that need write access, and delay readonly requests by 1 @@ -1632,7 +1632,7 @@ static int revokechild_destructor(struct revokechild_handle *rc) * be recovered. */ - if (rc->status == 0) { + if (rev_hdl->status == 0) { struct ctdb_req_call_old *c; c = (struct ctdb_req_call_old *)dcall->hdr; @@ -1647,15 +1647,19 @@ static int revokechild_destructor(struct revokechild_handle *rc) } if (now_list != NULL) { - tevent_add_timer(rc->ctdb->ev, rc->ctdb_db, + tevent_add_timer(rev_hdl->ctdb->ev, + rev_hdl->ctdb_db, tevent_timeval_current_ofs(0, 0), - deferred_call_requeue, now_list); + deferred_call_requeue, + now_list); } if (delay_list != NULL) { - tevent_add_timer(rc->ctdb->ev, rc->ctdb_db, + tevent_add_timer(rev_hdl->ctdb->ev, + rev_hdl->ctdb_db, tevent_timeval_current_ofs(1, 0), - deferred_call_requeue, delay_list); + deferred_call_requeue, + delay_list); } return 0; @@ -1665,26 +1669,26 @@ static void revokechild_handler(struct tevent_context *ev, struct tevent_fd *fde, uint16_t flags, void *private_data) { - struct revokechild_handle *rc = talloc_get_type(private_data, - struct revokechild_handle); + struct revokechild_handle *rev_hdl = + talloc_get_type(private_data, struct revokechild_handle); int ret; char c; - ret = sys_read(rc->fd[0], &c, 1); + ret = sys_read(rev_hdl->fd[0], &c, 1); if (ret != 1) { DEBUG(DEBUG_ERR,("Failed to read status from revokechild. errno:%d\n", errno)); - rc->status = -1; - talloc_free(rc); + rev_hdl->status = -1; + talloc_free(rev_hdl); return; } if (c != 0) { DEBUG(DEBUG_ERR,("revokechild returned failure. status:%d\n", c)); - rc->status = -1; - talloc_free(rc); + rev_hdl->status = -1; + talloc_free(rev_hdl); return; } - talloc_free(rc); + talloc_free(rev_hdl); } struct ctdb_revoke_state { @@ -1823,7 +1827,7 @@ static int ctdb_revoke_all_delegations(struct ctdb_context *ctdb, struct ctdb_db int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_context *ctdb_db, TDB_DATA key, struct ctdb_ltdb_header *header, TDB_DATA data) { TDB_DATA tdata; - struct revokechild_handle *rc; + struct revokechild_handle *rev_hdl; pid_t parent = getpid(); int ret; @@ -1831,7 +1835,7 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_contex header->flags |= CTDB_REC_FLAG_MIGRATED_WITH_DATA; header->rsn -= 1; - if ((rc = talloc_zero(ctdb_db, struct revokechild_handle)) == NULL) { + if ((rev_hdl = talloc_zero(ctdb_db, struct revokechild_handle)) == NULL) { DEBUG(DEBUG_ERR,("Failed to allocate revokechild_handle\n")); return -1; } @@ -1841,44 +1845,44 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_contex uint8_t *tmp; tmp = tdata.dptr; - tdata.dptr = talloc_memdup(rc, tdata.dptr, tdata.dsize); + tdata.dptr = talloc_memdup(rev_hdl, tdata.dptr, tdata.dsize); free(tmp); } - rc->status = 0; - rc->ctdb = ctdb; - rc->ctdb_db = ctdb_db; - rc->fd[0] = -1; - rc->fd[1] = -1; + rev_hdl->status = 0; + rev_hdl->ctdb = ctdb; + rev_hdl->ctdb_db = ctdb_db; + rev_hdl->fd[0] = -1; + rev_hdl->fd[1] = -1; - talloc_set_destructor(rc, revokechild_destructor); + talloc_set_destructor(rev_hdl, revokechild_destructor); - rc->key.dsize = key.dsize; - rc->key.dptr = talloc_memdup(rc, key.dptr, key.dsize); - if (rc->key.dptr == NULL) { + rev_hdl->key.dsize = key.dsize; + rev_hdl->key.dptr = talloc_memdup(rev_hdl, key.dptr, key.dsize); + if (rev_hdl->key.dptr == NULL) { DEBUG(DEBUG_ERR,("Failed to allocate key for revokechild_handle\n")); - talloc_free(rc); + talloc_free(rev_hdl); return -1; } - ret = pipe(rc->fd); + ret = pipe(rev_hdl->fd); if (ret != 0) { DEBUG(DEBUG_ERR,("Failed to allocate key for revokechild_handle\n")); - talloc_free(rc); + talloc_free(rev_hdl); return -1; } - rc->child = ctdb_fork(ctdb); - if (rc->child == (pid_t)-1) { + rev_hdl->child = ctdb_fork(ctdb); + if (rev_hdl->child == (pid_t)-1) { DEBUG(DEBUG_ERR,("Failed to fork child for revokechild\n")); - talloc_free(rc); + talloc_free(rev_hdl); return -1; } - if (rc->child == 0) { + if (rev_hdl->child == 0) { char c = 0; - close(rc->fd[0]); + close(rev_hdl->fd[0]); prctl_set_comment("ctdb_revokechild"); if (switch_from_server_to_client(ctdb) != 0) { @@ -1890,47 +1894,54 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_contex c = ctdb_revoke_all_delegations(ctdb, ctdb_db, tdata, key, header, data); child_finished: - sys_write(rc->fd[1], &c, 1); + sys_write(rev_hdl->fd[1], &c, 1); ctdb_wait_for_process_to_exit(parent); _exit(0); } - close(rc->fd[1]); - rc->fd[1] = -1; - set_close_on_exec(rc->fd[0]); + close(rev_hdl->fd[1]); + rev_hdl->fd[1] = -1; + set_close_on_exec(rev_hdl->fd[0]); /* This is an active revokechild child process */ - DLIST_ADD_END(ctdb_db->revokechild_active, rc); + DLIST_ADD_END(ctdb_db->revokechild_active, rev_hdl); - rc->fde = tevent_add_fd(ctdb->ev, rc, rc->fd[0], TEVENT_FD_READ, - revokechild_handler, (void *)rc); - if (rc->fde == NULL) { + rev_hdl->fde = tevent_add_fd(ctdb->ev, + rev_hdl, + rev_hdl->fd[0], + TEVENT_FD_READ, + revokechild_handler, + (void *)rev_hdl); + + if (rev_hdl->fde == NULL) { DEBUG(DEBUG_ERR,("Failed to set up fd event for revokechild process\n")); - talloc_free(rc); + talloc_free(rev_hdl); } - tevent_fd_set_auto_close(rc->fde); + tevent_fd_set_auto_close(rev_hdl->fde); return 0; } int ctdb_add_revoke_deferred_call(struct ctdb_context *ctdb, struct ctdb_db_context *ctdb_db, TDB_DATA key, struct ctdb_req_header *hdr, deferred_requeue_fn fn, void *call_context) { - struct revokechild_handle *rc; + struct revokechild_handle *rev_hdl; struct revokechild_deferred_call *deferred_call; - for (rc = ctdb_db->revokechild_active; rc; rc = rc->next) { - if (rc->key.dsize == 0) { + for (rev_hdl = ctdb_db->revokechild_active; + rev_hdl; + rev_hdl = rev_hdl->next) { + if (rev_hdl->key.dsize == 0) { continue; } - if (rc->key.dsize != key.dsize) { + if (rev_hdl->key.dsize != key.dsize) { continue; } - if (!memcmp(rc->key.dptr, key.dptr, key.dsize)) { + if (!memcmp(rev_hdl->key.dptr, key.dptr, key.dsize)) { break; } } - if (rc == NULL) { + if (rev_hdl == NULL) { DEBUG(DEBUG_ERR,("Failed to add deferred call to revoke list. revoke structure not found\n")); return -1; } @@ -1945,11 +1956,11 @@ int ctdb_add_revoke_deferred_call(struct ctdb_context *ctdb, struct ctdb_db_cont deferred_call->hdr = talloc_steal(deferred_call, hdr); deferred_call->fn = fn; deferred_call->ctx = call_context; - deferred_call->rc = rc; + deferred_call->rev_hdl = rev_hdl; talloc_set_destructor(deferred_call, deferred_call_destructor); - DLIST_ADD(rc->deferred_call_list, deferred_call); + DLIST_ADD(rev_hdl->deferred_call_list, deferred_call); return 0; } From a14987f258504f04bf4f7653f3a822c648dd82a1 Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Thu, 8 Feb 2018 11:57:23 +0100 Subject: [PATCH 11/64] ctdb-server: Minor code cleanup Cleanup ctdb_start_revoke_ro_record to improve readability. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/server/ctdb_call.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index 0fd35c90b78..d357f9407a2 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -1824,19 +1824,27 @@ static int ctdb_revoke_all_delegations(struct ctdb_context *ctdb, struct ctdb_db } -int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_context *ctdb_db, TDB_DATA key, struct ctdb_ltdb_header *header, TDB_DATA data) +int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, + struct ctdb_db_context *ctdb_db, + TDB_DATA key, + struct ctdb_ltdb_header *header, + TDB_DATA data) { TDB_DATA tdata; struct revokechild_handle *rev_hdl; pid_t parent = getpid(); int ret; - header->flags &= ~(CTDB_REC_RO_REVOKING_READONLY|CTDB_REC_RO_HAVE_DELEGATIONS|CTDB_REC_RO_HAVE_READONLY); + header->flags &= ~(CTDB_REC_RO_REVOKING_READONLY | + CTDB_REC_RO_HAVE_DELEGATIONS | + CTDB_REC_RO_HAVE_READONLY); + header->flags |= CTDB_REC_FLAG_MIGRATED_WITH_DATA; header->rsn -= 1; - if ((rev_hdl = talloc_zero(ctdb_db, struct revokechild_handle)) == NULL) { - DEBUG(DEBUG_ERR,("Failed to allocate revokechild_handle\n")); + rev_hdl = talloc_zero(ctdb_db, struct revokechild_handle); + if (rev_hdl == NULL) { + D_ERR("Failed to allocate revokechild_handle\n"); return -1; } @@ -1860,14 +1868,14 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_contex rev_hdl->key.dsize = key.dsize; rev_hdl->key.dptr = talloc_memdup(rev_hdl, key.dptr, key.dsize); if (rev_hdl->key.dptr == NULL) { - DEBUG(DEBUG_ERR,("Failed to allocate key for revokechild_handle\n")); + D_ERR("Failed to allocate key for revokechild_handle\n"); talloc_free(rev_hdl); return -1; } ret = pipe(rev_hdl->fd); if (ret != 0) { - DEBUG(DEBUG_ERR,("Failed to allocate key for revokechild_handle\n")); + D_ERR("Failed to allocate key for revokechild_handle\n"); talloc_free(rev_hdl); return -1; } @@ -1875,7 +1883,7 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_contex rev_hdl->child = ctdb_fork(ctdb); if (rev_hdl->child == (pid_t)-1) { - DEBUG(DEBUG_ERR,("Failed to fork child for revokechild\n")); + D_ERR("Failed to fork child for revokechild\n"); talloc_free(rev_hdl); return -1; } @@ -1886,12 +1894,18 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_contex prctl_set_comment("ctdb_revokechild"); if (switch_from_server_to_client(ctdb) != 0) { - DEBUG(DEBUG_ERR,("Failed to switch from server to client for revokechild process\n")); + D_ERR("Failed to switch from server to client " + "for revokechild process\n"); c = 1; goto child_finished; } - c = ctdb_revoke_all_delegations(ctdb, ctdb_db, tdata, key, header, data); + c = ctdb_revoke_all_delegations(ctdb, + ctdb_db, + tdata, + key, + header, + data); child_finished: sys_write(rev_hdl->fd[1], &c, 1); @@ -1914,7 +1928,7 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_contex (void *)rev_hdl); if (rev_hdl->fde == NULL) { - DEBUG(DEBUG_ERR,("Failed to set up fd event for revokechild process\n")); + D_ERR("Failed to set up fd event for revokechild process\n"); talloc_free(rev_hdl); } tevent_fd_set_auto_close(rev_hdl->fde); From aedac9c1891a9c4bf6b5b723f8011cb3abee8d89 Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Thu, 8 Feb 2018 12:08:45 +0100 Subject: [PATCH 12/64] ctdb-server: Add goto tag avoiding code duplication Introduced err_out goto tag to prevent code duplication. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/server/ctdb_call.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index d357f9407a2..beaae42fb59 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -1869,23 +1869,20 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, rev_hdl->key.dptr = talloc_memdup(rev_hdl, key.dptr, key.dsize); if (rev_hdl->key.dptr == NULL) { D_ERR("Failed to allocate key for revokechild_handle\n"); - talloc_free(rev_hdl); - return -1; + goto err_out; } ret = pipe(rev_hdl->fd); if (ret != 0) { D_ERR("Failed to allocate key for revokechild_handle\n"); - talloc_free(rev_hdl); - return -1; + goto err_out; } rev_hdl->child = ctdb_fork(ctdb); if (rev_hdl->child == (pid_t)-1) { D_ERR("Failed to fork child for revokechild\n"); - talloc_free(rev_hdl); - return -1; + goto err_out; } if (rev_hdl->child == 0) { @@ -1934,6 +1931,9 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, tevent_fd_set_auto_close(rev_hdl->fde); return 0; +err_out: + talloc_free(rev_hdl); + return -1; } int ctdb_add_revoke_deferred_call(struct ctdb_context *ctdb, struct ctdb_db_context *ctdb_db, TDB_DATA key, struct ctdb_req_header *hdr, deferred_requeue_fn fn, void *call_context) From f230047da534469908228e1f50c7028ccdb06784 Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Thu, 8 Feb 2018 12:19:09 +0100 Subject: [PATCH 13/64] ctdb-server: Only set destructor if required Set the detructor in ctdb_start_revoke_ro_record after the revokechild_handle was added to the list. Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Mar 31 03:45:51 CEST 2018 on sn-devel-144 --- ctdb/server/ctdb_call.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index beaae42fb59..03059206026 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -1863,8 +1863,6 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, rev_hdl->fd[0] = -1; rev_hdl->fd[1] = -1; - talloc_set_destructor(rev_hdl, revokechild_destructor); - rev_hdl->key.dsize = key.dsize; rev_hdl->key.dptr = talloc_memdup(rev_hdl, key.dptr, key.dsize); if (rev_hdl->key.dptr == NULL) { @@ -1914,9 +1912,6 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, rev_hdl->fd[1] = -1; set_close_on_exec(rev_hdl->fd[0]); - /* This is an active revokechild child process */ - DLIST_ADD_END(ctdb_db->revokechild_active, rev_hdl); - rev_hdl->fde = tevent_add_fd(ctdb->ev, rev_hdl, rev_hdl->fd[0], @@ -1930,6 +1925,10 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, } tevent_fd_set_auto_close(rev_hdl->fde); + /* This is an active revokechild child process */ + DLIST_ADD_END(ctdb_db->revokechild_active, rev_hdl); + talloc_set_destructor(rev_hdl, revokechild_destructor); + return 0; err_out: talloc_free(rev_hdl); From 9844a800f1249f27d2f254a461259cd22f3b0fbe Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Thu, 29 Mar 2018 10:45:19 +1100 Subject: [PATCH 14/64] ctdb-scripts: Drop "net serverid wipe" from 50.samba event script BUG: https://bugzilla.samba.org/show_bug.cgi?id=13359 There is no serverid database anymore. Signed-off-by: Amitay Isaacs Reviewed-by: Volker Lendecke Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Sat Mar 31 08:34:00 CEST 2018 on sn-devel-144 --- ctdb/config/events.d/50.samba | 2 -- 1 file changed, 2 deletions(-) diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba index 784d62cd2ab..f65f53a15db 100755 --- a/ctdb/config/events.d/50.samba +++ b/ctdb/config/events.d/50.samba @@ -51,8 +51,6 @@ service_start () # start Samba service. Start it reniced, as under very heavy load # the number of smbd processes will mean that it leaves few cycles # for anything else - net serverid wipe - if [ -n "$CTDB_SERVICE_NMB" ] ; then nice_service "$CTDB_SERVICE_NMB" start || die "Failed to start nmbd" fi From e5410490390fce200ed96669124bfd1cc6a8fb9b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 20 Mar 2018 16:49:30 +0100 Subject: [PATCH 15/64] lib/util: remove unused '#include ' from tests/tfork.c BUG: https://bugzilla.samba.org/show_bug.cgi?id=13342 Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- lib/util/tests/tfork.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/util/tests/tfork.c b/lib/util/tests/tfork.c index bf642fe37c9..9bcdc2f3d6d 100644 --- a/lib/util/tests/tfork.c +++ b/lib/util/tests/tfork.c @@ -32,7 +32,6 @@ #include "lib/util/sys_rw.h" #ifdef HAVE_PTHREAD #include -#include #endif static bool test_tfork_simple(struct torture_context *tctx) From b0e1100caf0339b8d09bfde666d0b0632b450888 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 20 Mar 2018 21:46:12 +0100 Subject: [PATCH 16/64] lib/replace: define __[u]intptr_t_defined if we prove an replacement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=13344 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke --- lib/replace/replace.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/replace/replace.h b/lib/replace/replace.h index e2a55415e04..626d3053029 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -691,10 +691,12 @@ typedef int bool; #if !defined(HAVE_INTPTR_T) typedef long long intptr_t ; +#define __intptr_t_defined #endif #if !defined(HAVE_UINTPTR_T) typedef unsigned long long uintptr_t ; +#define __uintptr_t_defined #endif #if !defined(HAVE_PTRDIFF_T) From 343cce37130f8f1cedd82fe57a18c6c63f0afca8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 21 Oct 2017 14:08:15 +0200 Subject: [PATCH 17/64] nsswitch: maintain prototypes for the linux based functions only once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=13344 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke --- nsswitch/winbind_nss.h | 6 ++++++ nsswitch/winbind_nss_freebsd.c | 19 ------------------- nsswitch/winbind_nss_linux.c | 22 ---------------------- nsswitch/winbind_nss_linux.h | 24 +++++++++++++++++++++--- nsswitch/winbind_nss_netbsd.c | 26 -------------------------- nsswitch/winbind_nss_solaris.h | 26 -------------------------- 6 files changed, 27 insertions(+), 96 deletions(-) diff --git a/nsswitch/winbind_nss.h b/nsswitch/winbind_nss.h index 05e07ad5d31..e98a961bc11 100644 --- a/nsswitch/winbind_nss.h +++ b/nsswitch/winbind_nss.h @@ -30,6 +30,7 @@ */ #include "nsswitch/winbind_nss_solaris.h" +#include "nsswitch/winbind_nss_linux.h" #elif HAVE_NSS_H @@ -37,6 +38,10 @@ * Linux (glibc) */ +#include + +typedef enum nss_status NSS_STATUS; + #include "nsswitch/winbind_nss_linux.h" #elif HAVE_NS_API_H @@ -60,6 +65,7 @@ */ #include "nsswitch/winbind_nss_netbsd.h" +#include "nsswitch/winbind_nss_linux.h" #else /* Nothing's defined. Neither gnu nor netbsd nor sun nor hp */ diff --git a/nsswitch/winbind_nss_freebsd.c b/nsswitch/winbind_nss_freebsd.c index e283872d0d8..f424adbe9e7 100644 --- a/nsswitch/winbind_nss_freebsd.c +++ b/nsswitch/winbind_nss_freebsd.c @@ -24,25 +24,6 @@ #include "winbind_client.h" /* Make sure that the module gets registered needed by freebsd 5.1 */ -extern enum nss_status _nss_winbind_getgrent_r(struct group *, char *, size_t, - int *); -extern enum nss_status _nss_winbind_getgrnam_r(const char *, struct group *, - char *, size_t, int *); -extern enum nss_status _nss_winbind_getgrgid_r(gid_t gid, struct group *, char *, - size_t, int *); -extern enum nss_status _nss_winbind_setgrent(void); -extern enum nss_status _nss_winbind_endgrent(void); -extern enum nss_status _nss_winbind_initgroups_dyn(char *, gid_t, long int *, - long int *, gid_t **, long int , int *); - -extern enum nss_status _nss_winbind_getpwent_r(struct passwd *, char *, size_t, - int *); -extern enum nss_status _nss_winbind_getpwnam_r(const char *, struct passwd *, - char *, size_t, int *); -extern enum nss_status _nss_winbind_getpwuid_r(gid_t gid, struct passwd *, char *, - size_t, int *); -extern enum nss_status _nss_winbind_setpwent(void); -extern enum nss_status _nss_winbind_endpwent(void); ns_mtab *nss_module_register(const char *, unsigned int *, nss_module_unregister_fn *); NSS_METHOD_PROTOTYPE(__nss_compat_getgrnam_r); diff --git a/nsswitch/winbind_nss_linux.c b/nsswitch/winbind_nss_linux.c index b5c50efcb39..fc165a18573 100644 --- a/nsswitch/winbind_nss_linux.c +++ b/nsswitch/winbind_nss_linux.c @@ -36,28 +36,6 @@ static pthread_mutex_t winbind_nss_mutex = PTHREAD_MUTEX_INITIALIZER; #define MAX_GETPWENT_USERS 250 #define MAX_GETGRENT_USERS 250 -NSS_STATUS _nss_winbind_setpwent(void); -NSS_STATUS _nss_winbind_endpwent(void); -NSS_STATUS _nss_winbind_getpwent_r(struct passwd *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getpwuid_r(uid_t uid, struct passwd *result, - char *buffer, size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getpwnam_r(const char *name, struct passwd *result, - char *buffer, size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_setgrent(void); -NSS_STATUS _nss_winbind_endgrent(void); -NSS_STATUS _nss_winbind_getgrent_r(struct group *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getgrlst_r(struct group *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getgrnam_r(const char *name, struct group *result, - char *buffer, size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, struct group *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start, - long int *size, gid_t **groups, - long int limit, int *errnop); - /************************************************************************* ************************************************************************/ diff --git a/nsswitch/winbind_nss_linux.h b/nsswitch/winbind_nss_linux.h index db5a378aad6..61e5261b237 100644 --- a/nsswitch/winbind_nss_linux.h +++ b/nsswitch/winbind_nss_linux.h @@ -22,8 +22,26 @@ #ifndef _WINBIND_NSS_LINUX_H #define _WINBIND_NSS_LINUX_H -#include - -typedef enum nss_status NSS_STATUS; +NSS_STATUS _nss_winbind_setpwent(void); +NSS_STATUS _nss_winbind_endpwent(void); +NSS_STATUS _nss_winbind_getpwent_r(struct passwd *result, char *buffer, + size_t buflen, int *errnop); +NSS_STATUS _nss_winbind_getpwuid_r(uid_t uid, struct passwd *result, + char *buffer, size_t buflen, int *errnop); +NSS_STATUS _nss_winbind_getpwnam_r(const char *name, struct passwd *result, + char *buffer, size_t buflen, int *errnop); +NSS_STATUS _nss_winbind_setgrent(void); +NSS_STATUS _nss_winbind_endgrent(void); +NSS_STATUS _nss_winbind_getgrent_r(struct group *result, char *buffer, + size_t buflen, int *errnop); +NSS_STATUS _nss_winbind_getgrlst_r(struct group *result, char *buffer, + size_t buflen, int *errnop); +NSS_STATUS _nss_winbind_getgrnam_r(const char *name, struct group *result, + char *buffer, size_t buflen, int *errnop); +NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, struct group *result, char *buffer, + size_t buflen, int *errnop); +NSS_STATUS _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start, + long int *size, gid_t **groups, + long int limit, int *errnop); #endif /* _WINBIND_NSS_LINUX_H */ diff --git a/nsswitch/winbind_nss_netbsd.c b/nsswitch/winbind_nss_netbsd.c index d3a558c996b..4edf64c2c11 100644 --- a/nsswitch/winbind_nss_netbsd.c +++ b/nsswitch/winbind_nss_netbsd.c @@ -38,32 +38,6 @@ static struct group _winbind_group; static char _winbind_groupbuf[1024]; -/* - * We need a proper prototype for this :-) - */ - -NSS_STATUS _nss_winbind_setpwent(void); -NSS_STATUS _nss_winbind_endpwent(void); -NSS_STATUS _nss_winbind_getpwent_r(struct passwd *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getpwuid_r(uid_t uid, struct passwd *result, - char *buffer, size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getpwnam_r(const char *name, struct passwd *result, - char *buffer, size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_setgrent(void); -NSS_STATUS _nss_winbind_endgrent(void); -NSS_STATUS _nss_winbind_getgrent_r(struct group *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getgrlst_r(struct group *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getgrnam_r(const char *name, struct group *result, - char *buffer, size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, struct group *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start, - long int *size, gid_t **groups, - long int limit, int *errnop); - int netbsdwinbind_endgrent(void *nsrv, void *nscb, va_list ap) { diff --git a/nsswitch/winbind_nss_solaris.h b/nsswitch/winbind_nss_solaris.h index f0cc099cf24..8e26d0da163 100644 --- a/nsswitch/winbind_nss_solaris.h +++ b/nsswitch/winbind_nss_solaris.h @@ -34,30 +34,4 @@ typedef nss_status_t NSS_STATUS; #define NSS_STATUS_UNAVAIL NSS_UNAVAIL #define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN -/* The solaris winbind is implemented as a wrapper around the linux - version. */ - -NSS_STATUS _nss_winbind_setpwent(void); -NSS_STATUS _nss_winbind_endpwent(void); -NSS_STATUS _nss_winbind_getpwent_r(struct passwd* result, char* buffer, - size_t buflen, int* errnop); -NSS_STATUS _nss_winbind_getpwuid_r(uid_t, struct passwd*, char* buffer, - size_t buflen, int* errnop); -NSS_STATUS _nss_winbind_getpwnam_r(const char* name, struct passwd* result, - char* buffer, size_t buflen, int* errnop); - -NSS_STATUS _nss_winbind_setgrent(void); -NSS_STATUS _nss_winbind_endgrent(void); -NSS_STATUS _nss_winbind_getgrent_r(struct group* result, char* buffer, - size_t buflen, int* errnop); -NSS_STATUS _nss_winbind_getgrnam_r(const char *name, - struct group *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, - struct group *result, char *buffer, - size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start, - long int *size, gid_t **groups, - long int limit, int *errnop); - #endif /* _WINBIND_NSS_SOLARIS_H */ From b652396b64f5c9cae330d110b31ca608c14c5457 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 21 Oct 2017 14:14:34 +0200 Subject: [PATCH 18/64] nsswitch: add some const to _nss_winbind_initgroups_dyn() prototype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=13344 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke --- nsswitch/winbind_nss_linux.c | 2 +- nsswitch/winbind_nss_linux.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nsswitch/winbind_nss_linux.c b/nsswitch/winbind_nss_linux.c index fc165a18573..442c06e612f 100644 --- a/nsswitch/winbind_nss_linux.c +++ b/nsswitch/winbind_nss_linux.c @@ -1024,7 +1024,7 @@ _nss_winbind_getgrgid_r(gid_t gid, /* Initialise supplementary groups */ NSS_STATUS -_nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start, +_nss_winbind_initgroups_dyn(const char *user, gid_t group, long int *start, long int *size, gid_t **groups, long int limit, int *errnop) { diff --git a/nsswitch/winbind_nss_linux.h b/nsswitch/winbind_nss_linux.h index 61e5261b237..d18799ed118 100644 --- a/nsswitch/winbind_nss_linux.h +++ b/nsswitch/winbind_nss_linux.h @@ -40,7 +40,7 @@ NSS_STATUS _nss_winbind_getgrnam_r(const char *name, struct group *result, char *buffer, size_t buflen, int *errnop); NSS_STATUS _nss_winbind_getgrgid_r(gid_t gid, struct group *result, char *buffer, size_t buflen, int *errnop); -NSS_STATUS _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start, +NSS_STATUS _nss_winbind_initgroups_dyn(const char *user, gid_t group, long int *start, long int *size, gid_t **groups, long int limit, int *errnop); From b5bbfe86523097d24c482e2e9aad9b5df4aaddd2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 21 Oct 2017 14:15:12 +0200 Subject: [PATCH 19/64] nsswitch: fix the developer build of nsswitch/wins.c on freebsd 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=13344 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke --- nsswitch/wins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsswitch/wins.c b/nsswitch/wins.c index 19d3c5b4fcc..72055f099b6 100644 --- a/nsswitch/wins.c +++ b/nsswitch/wins.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "nsswitch/winbind_nss.h" +#include "nsswitch/winbind_client.h" #include "nsswitch/libwbclient/wbclient.h" #ifdef HAVE_NS_API_H From 5a252a5fd5ea638b7429919ff40c3d4aa7811bd1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 20 Mar 2018 12:10:01 +0100 Subject: [PATCH 20/64] s3:modules: fix the picky-developer build of vfs_virusfilter.c on FreeBSD 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=13344 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke --- source3/modules/vfs_virusfilter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/modules/vfs_virusfilter.c b/source3/modules/vfs_virusfilter.c index ef9dc78263b..0b4bc724f3a 100644 --- a/source3/modules/vfs_virusfilter.c +++ b/source3/modules/vfs_virusfilter.c @@ -275,8 +275,9 @@ static int virusfilter_vfs_connect( temp_quarantine_dir_mode = lp_parm_const_string( snum, "virusfilter", "quarantine directory mode", "0755"); if (temp_quarantine_dir_mode != NULL) { - sscanf(temp_quarantine_dir_mode, "%o", - &config->quarantine_dir_mode); + unsigned int mode = 0; + sscanf(temp_quarantine_dir_mode, "%o", &mode); + config->quarantine_dir_mode = mode; } config->quarantine_prefix = lp_parm_const_string( From 1b10f0bafb543bf3224059ea917a98f53f7000da Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 21 Mar 2018 07:25:11 +0100 Subject: [PATCH 21/64] s3:modules: make virusfilter_io_connect_path() more portable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have existing utility functions to prepare a socket. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13343 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke --- source3/modules/vfs_virusfilter_utils.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/source3/modules/vfs_virusfilter_utils.c b/source3/modules/vfs_virusfilter_utils.c index 90ae427023b..f56fc6ed5d8 100644 --- a/source3/modules/vfs_virusfilter_utils.c +++ b/source3/modules/vfs_virusfilter_utils.c @@ -147,8 +147,9 @@ bool virusfilter_io_connect_path( { struct sockaddr_un addr; NTSTATUS status; - int socket, bes_result, flags, ret; + int socket, ret; size_t len; + bool ok; ZERO_STRUCT(addr); addr.sun_family = AF_UNIX; @@ -168,23 +169,23 @@ bool virusfilter_io_connect_path( } /* We must not block */ - flags = fcntl(socket, F_GETFL); - if (flags <= 0) { - /* Handle error by ignoring */; - flags = 0; - DBG_WARNING("Could not get flags on socket (%s).\n", - strerror(errno)); - } - flags |= SOCK_NONBLOCK; - ret = fcntl(socket, F_SETFL, flags); + ret = set_blocking(socket, false); if (ret == -1) { - /* Handle error by ignoring for now */ - DBG_WARNING("Could not set flags on socket: %s.\n", - strerror(errno)); + close(socket); + io_h->stream = NULL; + return false; } - bes_result = tstream_bsd_existing_socket(io_h, socket, &io_h->stream); - if (bes_result < 0) { + ok = smb_set_close_on_exec(socket); + if (!ok) { + close(socket); + io_h->stream = NULL; + return false; + } + + ret = tstream_bsd_existing_socket(io_h, socket, &io_h->stream); + if (ret == -1) { + close(socket); DBG_ERR("Could not convert socket to tstream: %s.\n", strerror(errno)); io_h->stream = NULL; From d3ff71d2459f5ebf721ddd107fb314dd6748aef7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 21 Mar 2018 07:33:16 +0100 Subject: [PATCH 22/64] lib/crypto: avoid 'return void_function();' which isn't portable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=13343 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke --- lib/crypto/aes.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/crypto/aes.c b/lib/crypto/aes.c index d16d715482e..4ff019af91a 100644 --- a/lib/crypto/aes.c +++ b/lib/crypto/aes.c @@ -236,18 +236,20 @@ void AES_encrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key) { if (has_intel_aes_instructions()) { - return AES_encrypt_aesni(in, out, key); + AES_encrypt_aesni(in, out, key); + return; } - return AES_encrypt_rj(in, out, key); + AES_encrypt_rj(in, out, key); } void AES_decrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key) { if (has_intel_aes_instructions()) { - return AES_decrypt_aesni(in, out, key); + AES_decrypt_aesni(in, out, key); + return; } - return AES_decrypt_rj(in, out, key); + AES_decrypt_rj(in, out, key); } #endif /* SAMBA_RIJNDAEL */ From f0db4917a16e1127afa59638b623e33fb370f4a0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 21 Mar 2018 07:33:16 +0100 Subject: [PATCH 23/64] ldb/tests: avoid 'return void_function();' which isn't portable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=13343 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke --- lib/ldb/tests/ldb_mod_op_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c index b91130252a7..d024ab66e3e 100644 --- a/lib/ldb/tests/ldb_mod_op_test.c +++ b/lib/ldb/tests/ldb_mod_op_test.c @@ -1954,22 +1954,22 @@ static void test_ldb_modify_during_search(void **state, bool add_index, static void test_ldb_modify_during_indexed_search(void **state) { - return test_ldb_modify_during_search(state, true, false); + test_ldb_modify_during_search(state, true, false); } static void test_ldb_modify_during_unindexed_search(void **state) { - return test_ldb_modify_during_search(state, false, false); + test_ldb_modify_during_search(state, false, false); } static void test_ldb_rename_during_indexed_search(void **state) { - return test_ldb_modify_during_search(state, true, true); + test_ldb_modify_during_search(state, true, true); } static void test_ldb_rename_during_unindexed_search(void **state) { - return test_ldb_modify_during_search(state, false, true); + test_ldb_modify_during_search(state, false, true); } /* From d9eb8337cd1b49fc2b64f0248c53695c5d3eff6c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 21 Mar 2018 07:48:16 +0100 Subject: [PATCH 24/64] s3:modules: fix the build of vfs_aixacl2.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG: https://bugzilla.samba.org/show_bug.cgi?id=13345 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Tue Apr 3 20:18:58 CEST 2018 on sn-devel-144 --- source3/modules/vfs_aixacl2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index d0cd2c1cbc2..e094be1cdb9 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -476,7 +476,8 @@ int aixjfs2_sys_acl_set_file(vfs_handle_struct *handle, acl_type_t acl_type_info; int rc; - DEBUG(10, ("aixjfs2_sys_acl_set_file invoked for %s", name)); + DEBUG(10, ("aixjfs2_sys_acl_set_file invoked for %s", + smb_fname->base_name)); rc = aixjfs2_query_acl_support((char *)smb_fname->base_name, ACL_AIXC, &acl_type_info); @@ -490,7 +491,7 @@ int aixjfs2_sys_acl_set_file(vfs_handle_struct *handle, return -1; rc = aclx_put( - (char *)name, + (char *)smb_fname->base_name, SET_ACL, /* set only the ACL, not mode bits */ acl_type_info, acl_aixc, From 6db90eec0811fb1ba4071d62b7d56f27c222bf23 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Mar 2018 17:19:39 +0100 Subject: [PATCH 25/64] third_party: Update pam_wrapper to version 1.0.6 This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- third_party/pam_wrapper/pam_wrapper.c | 126 +++++++++++++++++++++++++++------- third_party/pam_wrapper/wscript | 2 +- 2 files changed, 104 insertions(+), 24 deletions(-) diff --git a/third_party/pam_wrapper/pam_wrapper.c b/third_party/pam_wrapper/pam_wrapper.c index 482b38841a3..8064954ff47 100644 --- a/third_party/pam_wrapper/pam_wrapper.c +++ b/third_party/pam_wrapper/pam_wrapper.c @@ -531,7 +531,7 @@ static void libpam_pam_vsyslog(const pam_handle_t *pamh, #define BUFFER_SIZE 32768 /* copy file from src to dst, overwrites dst */ -static int p_copy(const char *src, const char *dst, const char *pdir, mode_t mode) +static int p_copy(const char *src, const char *dst, mode_t mode) { int srcfd = -1; int dstfd = -1; @@ -567,7 +567,6 @@ static int p_copy(const char *src, const char *dst, const char *pdir, mode_t mod } for (;;) { - char *p; bread = read(srcfd, buf, BUFFER_SIZE); if (bread == 0) { /* done */ @@ -578,21 +577,6 @@ static int p_copy(const char *src, const char *dst, const char *pdir, mode_t mod goto out; } - /* EXTRA UGLY HACK */ - if (pdir != NULL) { - p = buf; - - while (p < buf + BUFFER_SIZE) { - if (*p == '/') { - cmp = memcmp(p, "/etc/pam.d", 10); - if (cmp == 0) { - memcpy(p, pdir, 10); - } - } - p++; - } - } - bwritten = write(dstfd, buf, bread); if (bwritten < 0) { errno = EIO; @@ -668,7 +652,7 @@ static int copy_ftw(const char *fpath, } PWRAP_LOG(PWRAP_LOG_TRACE, "Copying %s", fpath); - rc = p_copy(fpath, buf, NULL, sb->st_mode); + rc = p_copy(fpath, buf, sb->st_mode); if (rc != 0) { return FTW_STOP; } @@ -756,6 +740,100 @@ static void pwrap_clean_stale_dirs(const char *dir) return; } +static int pso_copy(const char *src, const char *dst, const char *pdir, mode_t mode) +{ + int srcfd = -1; + int dstfd = -1; + int rc = -1; + ssize_t bread, bwritten; + struct stat sb; + char buf[10]; + int cmp; + size_t to_read; + bool found_slash; + + cmp = strcmp(src, dst); + if (cmp == 0) { + return -1; + } + + srcfd = open(src, O_RDONLY, 0); + if (srcfd < 0) { + return -1; + } + + if (mode == 0) { + rc = fstat(srcfd, &sb); + if (rc != 0) { + rc = -1; + goto out; + } + mode = sb.st_mode; + } + + dstfd = open(dst, O_CREAT|O_WRONLY|O_TRUNC, mode); + if (dstfd < 0) { + rc = -1; + goto out; + } + + found_slash = false; + to_read = 1; + + for (;;) { + bread = read(srcfd, buf, to_read); + if (bread == 0) { + /* done */ + break; + } else if (bread < 0) { + errno = EIO; + rc = -1; + goto out; + } + + to_read = 1; + if (!found_slash && buf[0] == '/') { + found_slash = true; + to_read = 9; + } + + if (found_slash && bread == 9) { + cmp = memcmp(buf, "etc/pam.d", 9); + if (cmp == 0) { + memcpy(buf, pdir + 1, 9); + } + found_slash = false; + } + + bwritten = write(dstfd, buf, bread); + if (bwritten < 0) { + errno = EIO; + rc = -1; + goto out; + } + + if (bread != bwritten) { + errno = EFAULT; + rc = -1; + goto out; + } + } + + rc = 0; +out: + if (srcfd != -1) { + close(srcfd); + } + if (dstfd != -1) { + close(dstfd); + } + if (rc < 0) { + unlink(dst); + } + + return rc; +} + static void pwrap_init(void) { char tmp_config_dir[] = "/tmp/pam.X"; @@ -908,11 +986,13 @@ static void pwrap_init(void) "%s", pam_library); } else { - char libpam_path_cp[sizeof(libpam_path)]; - char *dname; + char libpam_path_cp[1024] = {0}; + char *dname = NULL; - strncpy(libpam_path_cp, libpam_path, sizeof(libpam_path_cp)); - libpam_path_cp[sizeof(libpam_path_cp) - 1] = '\0'; + snprintf(libpam_path_cp, + sizeof(libpam_path_cp), + "%s", + libpam_path); dname = dirname(libpam_path_cp); if (dname == NULL) { @@ -931,7 +1011,7 @@ static void pwrap_init(void) PWRAP_LOG(PWRAP_LOG_TRACE, "Reconstructed PAM path: %s", libpam_path); PWRAP_LOG(PWRAP_LOG_DEBUG, "Copy %s to %s", libpam_path, pwrap.libpam_so); - rc = p_copy(libpam_path, pwrap.libpam_so, pwrap.config_dir, 0644); + rc = pso_copy(libpam_path, pwrap.libpam_so, pwrap.config_dir, 0644); if (rc != 0) { PWRAP_LOG(PWRAP_LOG_ERROR, "Failed to copy %s - error: %s", diff --git a/third_party/pam_wrapper/wscript b/third_party/pam_wrapper/wscript index 6749159da42..f70fc66351a 100644 --- a/third_party/pam_wrapper/wscript +++ b/third_party/pam_wrapper/wscript @@ -2,7 +2,7 @@ import os -VERSION="1.0.5" +VERSION="1.0.6" def find_library(library_names, lookup_paths): for directory in lookup_paths: From fc08816d4f86116eb4a5730d8c4e0e7c3686f78d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Mar 2018 09:53:03 +0100 Subject: [PATCH 26/64] ldb: Add test for ldb_qsort() Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- lib/ldb/tests/test_ldb_qsort.c | 64 ++++++++++++++++++++++++++++++++++++++++++ lib/ldb/wscript | 8 +++++- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 lib/ldb/tests/test_ldb_qsort.c diff --git a/lib/ldb/tests/test_ldb_qsort.c b/lib/ldb/tests/test_ldb_qsort.c new file mode 100644 index 00000000000..06e80d94379 --- /dev/null +++ b/lib/ldb/tests/test_ldb_qsort.c @@ -0,0 +1,64 @@ +/* + * Unix SMB/CIFS implementation. + * + * Copyright (C) 2018 Andreas Schneider + * + * 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 . + */ + +#include +#include +#include +#include + +#include + +static int cmp_integer(int *a, int *b, void *opaque) +{ + if (a == NULL || b == NULL) { + return 0; + } + + if (*a > *b) { + return 1; + } + + if (*a < *b) { + return -1; + } + + return 0; +} + +static void test_ldb_qsort(void **state) +{ + int a[6] = { 6, 3, 2, 7, 9, 4 }; + + ldb_qsort(a, 6, sizeof(int), NULL, (ldb_qsort_cmp_fn_t)cmp_integer); + + assert_int_equal(a[0], 2); + assert_int_equal(a[1], 3); + assert_int_equal(a[2], 4); + assert_int_equal(a[3], 6); + assert_int_equal(a[4], 7); + assert_int_equal(a[5], 9); +} + +int main(void) { + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_ldb_qsort), + }; + + return cmocka_run_group_tests(tests, NULL, NULL); +} diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 1455f92eb2e..1c9573f1cc4 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -358,6 +358,11 @@ def build(bld): deps='cmocka ldb', install=False) + bld.SAMBA_BINARY('test_ldb_qsort', + source='tests/test_ldb_qsort.c', + deps='cmocka ldb', + install=False) + def test(ctx): '''run ldb testsuite''' import Utils, samba_utils, shutil @@ -386,7 +391,8 @@ def test(ctx): cmocka_ret = 0 for test_exe in ['ldb_tdb_mod_op_test', - 'ldb_msg_test']: + 'ldb_msg_test', + 'test_ldb_qsort']: cmd = os.path.join(Utils.g_module.blddir, test_exe) cmocka_ret = cmocka_ret or samba_utils.RUN_COMMAND(cmd) From 7f8bf6bba4c4e50ceb528319c6b267a5f8d96e0c Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Mar 2018 16:25:30 +0100 Subject: [PATCH 27/64] ldb: Fix overflow checks This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- lib/ldb/common/qsort.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ldb/common/qsort.c b/lib/ldb/common/qsort.c index 1a0b886b8c2..012aaf3c403 100644 --- a/lib/ldb/common/qsort.c +++ b/lib/ldb/common/qsort.c @@ -59,9 +59,8 @@ typedef struct #define CHAR_BIT 8 #endif #define STACK_SIZE (CHAR_BIT * sizeof(size_t)) -#define PUSH(low, high) ((void) ((top->lo = (low)), (top->hi = (high)), ++top)) -#define POP(low, high) ((void) (--top, (low = top->lo), (high = top->hi))) -#define STACK_NOT_EMPTY (stack < top) +#define PUSH(low, high) ((void) ((stack[i].lo = (low)), (stack[i].hi = (high)), i++)) +#define POP(low, high) ((void) (i--, (low = stack[i].lo), (high = stack[i].hi))) /* Order size using quicksort. This implementation incorporates @@ -104,11 +103,11 @@ void ldb_qsort (void *const pbase, size_t total_elems, size_t size, char *lo = base_ptr; char *hi = &lo[size * (total_elems - 1)]; stack_node stack[STACK_SIZE]; - stack_node *top = stack; + size_t i = 0; PUSH (NULL, NULL); - while (STACK_NOT_EMPTY) + do { char *left_ptr; char *right_ptr; @@ -194,6 +193,7 @@ void ldb_qsort (void *const pbase, size_t total_elems, size_t size, hi = right_ptr; } } + while (i > 0 && i < STACK_SIZE); } /* Once the BASE_PTR array is partially sorted by quicksort the rest From 60dc1a9dbf22d3e1ee9ec33a7f42039b01a0fbc0 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Mar 2018 14:32:49 +0100 Subject: [PATCH 28/64] third_party: Fix size type in cmocka This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- third_party/cmocka/cmocka.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/third_party/cmocka/cmocka.c b/third_party/cmocka/cmocka.c index 14b2765b781..a5115c7cb5e 100644 --- a/third_party/cmocka/cmocka.c +++ b/third_party/cmocka/cmocka.c @@ -244,8 +244,8 @@ static void free_symbol_map_value( static void remove_always_return_values(ListNode * const map_head, const size_t number_of_symbol_names); -static int check_for_leftover_values_list(const ListNode * head, - const char * const error_message); +static size_t check_for_leftover_values_list(const ListNode * head, + const char * const error_message); static int check_for_leftover_values( const ListNode * const map_head, const char * const error_message, @@ -811,11 +811,11 @@ static void remove_always_return_values(ListNode * const map_head, } } -static int check_for_leftover_values_list(const ListNode * head, - const char * const error_message) +static size_t check_for_leftover_values_list(const ListNode * head, + const char * const error_message) { ListNode *child_node; - int leftover_count = 0; + size_t leftover_count = 0; if (!list_empty(head)) { for (child_node = head->next; child_node != head; @@ -1952,10 +1952,10 @@ static const ListNode* check_point_allocated_blocks(void) { /* Display the blocks allocated after the specified check point. This * function returns the number of blocks displayed. */ -static int display_allocated_blocks(const ListNode * const check_point) { +static size_t display_allocated_blocks(const ListNode * const check_point) { const ListNode * const head = get_allocated_blocks_list(); const ListNode *node; - int allocated_blocks = 0; + size_t allocated_blocks = 0; assert_non_null(check_point); assert_non_null(check_point->next); @@ -1964,14 +1964,14 @@ static int display_allocated_blocks(const ListNode * const check_point) { (const MallocBlockInfo*)node->value; assert_non_null(block_info); - if (!allocated_blocks) { + if (allocated_blocks == 0) { cm_print_error("Blocks allocated...\n"); } cm_print_error(SOURCE_LOCATION_FORMAT ": note: block %p allocated here\n", block_info->location.file, block_info->location.line, block_info->block); - allocated_blocks ++; + allocated_blocks++; } return allocated_blocks; } @@ -1997,10 +1997,10 @@ static void free_allocated_blocks(const ListNode * const check_point) { /* Fail if any any blocks are allocated after the specified check point. */ static void fail_if_blocks_allocated(const ListNode * const check_point, const char * const test_name) { - const int allocated_blocks = display_allocated_blocks(check_point); - if (allocated_blocks) { + const size_t allocated_blocks = display_allocated_blocks(check_point); + if (allocated_blocks > 0) { free_allocated_blocks(check_point); - cm_print_error("ERROR: %s leaked %d block(s)\n", test_name, + cm_print_error("ERROR: %s leaked %zu block(s)\n", test_name, allocated_blocks); exit_test(1); } From bdda1257ed076bfeecc8eb073285d889547a2955 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Mar 2018 12:49:38 +0100 Subject: [PATCH 29/64] lib:util: Fix size types in fgets_slash() This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- lib/util/samba_util.h | 2 +- lib/util/util_file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h index b78252316c8..7b96a595d43 100644 --- a/lib/util/samba_util.h +++ b/lib/util/samba_util.h @@ -352,7 +352,7 @@ const char **str_list_make_v3_const(TALLOC_CTX *mem_ctx, */ _PUBLIC_ char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint); -char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, int maxlen, FILE *f); +char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, size_t maxlen, FILE *f); /** load a file into memory from a fd. diff --git a/lib/util/util_file.c b/lib/util/util_file.c index 499e8c46693..bf2f3e1a27f 100644 --- a/lib/util/util_file.c +++ b/lib/util/util_file.c @@ -79,10 +79,10 @@ _PUBLIC_ char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint) return data; } -char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, int maxlen, FILE *f) +char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, size_t maxlen, FILE *f) { char *s = s2; - int len = 0; + size_t len = 0; int c; bool start_of_line = true; From bc62c432369809005378b097fd5113a84ae75909 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Mar 2018 16:46:49 +0100 Subject: [PATCH 30/64] s4:registry: Fix size type and loop This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source4/lib/registry/tools/regshell.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index 5308d30e849..48251c33ea4 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -428,7 +428,7 @@ static char **reg_complete_command(const char *text, int start, int end) /* Complete command */ char **matches; size_t len, samelen=0; - int i, count=1; + size_t i, count = 1; matches = malloc_array_p(char *, MAX_COMPLETIONS); if (!matches) return NULL; @@ -463,10 +463,8 @@ static char **reg_complete_command(const char *text, int start, int end) return matches; cleanup: - count--; - while (count >= 0) { - free(matches[count]); - count--; + for (i = 0; i < count; i++) { + free(matches[i]); } free(matches); return NULL; From 5236457ee0e42b445611b2801e5437f1b8be18e7 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Mar 2018 10:28:02 +0100 Subject: [PATCH 31/64] s4:client: Fix size types and loop This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source4/client/client.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source4/client/client.c b/source4/client/client.c index f73d9f99d20..284511fb58a 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3053,7 +3053,7 @@ static char **completion_fn(const char *text, int start, int end) return NULL; } else { char **matches; - int i, len, samelen = 0, count=1; + size_t i, len, samelen = 0, count=1; matches = malloc_array_p(char *, MAX_COMPLETIONS); if (!matches) return NULL; @@ -3092,10 +3092,8 @@ static char **completion_fn(const char *text, int start, int end) return matches; cleanup: - count--; - while (count >= 0) { - free(matches[count]); - count--; + for (i = 0; i < count; i++) { + free(matches[i]); } free(matches); return NULL; From 058ffcfb1ee42b4ca0dbfc2c2655a39fcf6cd6ac Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Mar 2018 13:02:26 +0100 Subject: [PATCH 32/64] heimdal: Fix size types and array access This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- .../heimdal/lib/gssapi/mech/gss_set_cred_option.c | 2 +- source4/heimdal/lib/krb5/addr_families.c | 29 +++++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/source4/heimdal/lib/gssapi/mech/gss_set_cred_option.c b/source4/heimdal/lib/gssapi/mech/gss_set_cred_option.c index d33453d92fe..653565b856d 100644 --- a/source4/heimdal/lib/gssapi/mech/gss_set_cred_option.c +++ b/source4/heimdal/lib/gssapi/mech/gss_set_cred_option.c @@ -41,7 +41,7 @@ gss_set_cred_option (OM_uint32 *minor_status, struct _gss_cred *cred = (struct _gss_cred *) *cred_handle; OM_uint32 major_status = GSS_S_COMPLETE; struct _gss_mechanism_cred *mc; - int one_ok = 0; + OM_uint32 one_ok = 0; *minor_status = 0; diff --git a/source4/heimdal/lib/krb5/addr_families.c b/source4/heimdal/lib/krb5/addr_families.c index 5d321a7e917..1f7b7266608 100644 --- a/source4/heimdal/lib/krb5/addr_families.c +++ b/source4/heimdal/lib/krb5/addr_families.c @@ -803,7 +803,7 @@ static struct addr_operations at[] = { } }; -static int num_addrs = sizeof(at) / sizeof(at[0]); +static size_t num_addrs = sizeof(at) / sizeof(at[0]); static size_t max_sockaddr_size = 0; @@ -814,22 +814,26 @@ static size_t max_sockaddr_size = 0; static struct addr_operations * find_af(int af) { - struct addr_operations *a; + size_t i; - for (a = at; a < at + num_addrs; ++a) - if (af == a->af) - return a; + for (i = 0; i < num_addrs; i++) { + if (af == at[i].af) { + return &at[i]; + } + } return NULL; } static struct addr_operations * find_atype(krb5_address_type atype) { - struct addr_operations *a; + size_t i; - for (a = at; a < at + num_addrs; ++a) - if (atype == a->atype) - return a; + for (i = 0; i < num_addrs; i++) { + if (atype == at[i].atype) { + return &at[i]; + } + } return NULL; } @@ -949,10 +953,11 @@ KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL krb5_max_sockaddr_size (void) { if (max_sockaddr_size == 0) { - struct addr_operations *a; + size_t i; - for(a = at; a < at + num_addrs; ++a) - max_sockaddr_size = max(max_sockaddr_size, a->max_sockaddr_size); + for (i = 0; i < num_addrs; i++) { + max_sockaddr_size = max(max_sockaddr_size, at[i].max_sockaddr_size); + } } return max_sockaddr_size; } From 78c7bacb20fc1ec90a140a3d8778d60f1cb54e4d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 21 Mar 2018 17:46:30 +0100 Subject: [PATCH 33/64] s4:torture: Fix size types in torture_create_procs() This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source4/torture/util_smb.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c index fcbdc7a86ed..5ca816f7cde 100644 --- a/source4/torture/util_smb.c +++ b/source4/torture/util_smb.c @@ -593,11 +593,12 @@ double torture_create_procs(struct torture_context *tctx, bool (*fn)(struct torture_context *, struct smbcli_state *, int), bool *result) { - int i, status; + int status; + size_t i; struct child_status *child_status; - int synccount; - int tries = 8; - int torture_nprocs = torture_setting_int(tctx, "nprocs", 4); + size_t synccount; + size_t tries = 8; + size_t torture_nprocs = torture_setting_int(tctx, "nprocs", 4); double start_time_limit = 10 + (torture_nprocs * 1.5); struct timeval tv; @@ -629,7 +630,7 @@ double torture_create_procs(struct torture_context *tctx, pid_t mypid = getpid(); srandom(((int)mypid) ^ ((int)time(NULL))); - if (asprintf(&myname, "CLIENT%d", i) == -1) { + if (asprintf(&myname, "CLIENT%zu", i) == -1) { printf("asprintf failed\n"); return -1; } @@ -654,7 +655,7 @@ double torture_create_procs(struct torture_context *tctx, if (!child_status[i].start) { child_status[i].result = TORTURE_ERROR; - printf("Child %d failed to start!\n", i); + printf("Child %zu failed to start!\n", i); _exit(1); } @@ -671,14 +672,14 @@ double torture_create_procs(struct torture_context *tctx, if (strlen(tctx->last_reason) > 1023) { /* note: reason already contains \n */ torture_comment(tctx, - "child %d (pid %u) failed: %s", + "child %zu (pid %u) failed: %s", i, (unsigned)child_status[i].pid, tctx->last_reason); } snprintf(child_status[i].reason, - 1024, "child %d (pid %u) failed: %s", + 1024, "child %zu (pid %u) failed: %s", i, (unsigned)child_status[i].pid, tctx->last_reason); /* ensure proper "\n\0" termination: */ @@ -705,7 +706,7 @@ double torture_create_procs(struct torture_context *tctx, } while (timeval_elapsed(&tv) < start_time_limit); if (synccount != torture_nprocs) { - printf("FAILED TO START %d CLIENTS (started %d)\n", torture_nprocs, synccount); + printf("FAILED TO START %zu CLIENTS (started %zu)\n", torture_nprocs, synccount); /* cleanup child processes */ for (i = 0; i < torture_nprocs; i++) { @@ -718,7 +719,7 @@ double torture_create_procs(struct torture_context *tctx, return timeval_elapsed(&tv); } - printf("Starting %d clients\n", torture_nprocs); + printf("Starting %zu clients\n", torture_nprocs); /* start the client load */ tv = timeval_current(); @@ -726,7 +727,7 @@ double torture_create_procs(struct torture_context *tctx, child_status[i].start = true; } - printf("%d clients started\n", torture_nprocs); + printf("%zu clients started\n", torture_nprocs); kill(0, SIGCONT); From 0ca0b89475878634b6daf8b18f42f0a6dfa5fa46 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Mar 2018 11:49:18 +0100 Subject: [PATCH 34/64] s3:smbd: Fix size types in reply_negprot() This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source3/smbd/negprot.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index a36822e1907..27366ea0013 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -557,14 +557,15 @@ static const struct { void reply_negprot(struct smb_request *req) { - int choice= -1; + size_t choice = 0; int chosen_level = -1; + bool choice_set = false; int protocol; const char *p; int protocols = 0; int num_cliprotos; char **cliprotos; - int i; + size_t i; size_t converted_size; struct smbXsrv_connection *xconn = req->xconn; struct smbd_server_connection *sconn = req->sconn; @@ -733,14 +734,16 @@ void reply_negprot(struct smb_request *req) if (strequal(cliprotos[i],supported_protocols[protocol].proto_name)) { choice = i; chosen_level = supported_protocols[protocol].protocol_level; + choice_set = true; } i++; } - if(choice != -1) + if (choice_set) { break; + } } - if (choice == -1) { + if (!choice_set) { bool ok; DBG_NOTICE("No protocol supported !\n"); @@ -760,7 +763,7 @@ void reply_negprot(struct smb_request *req) supported_protocols[protocol].proto_reply_fn(req, choice); DEBUG(3,("Selected protocol %s\n",supported_protocols[protocol].proto_name)); - DEBUG( 5, ( "negprot index=%d\n", choice ) ); + DBG_INFO("negprot index=%zu\n", choice); /* We always have xconn->smb1.signing_state also for >= SMB2_02 */ signing_required = smb_signing_is_mandatory(xconn->smb1.signing_state); From 5c9ddd7200cb027bf06436ce4cd310d242fe3c29 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Mar 2018 13:41:39 +0100 Subject: [PATCH 35/64] s3:printing: Fix size types This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source3/include/printing.h | 2 +- source3/printing/printing.c | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/source3/include/printing.h b/source3/include/printing.h index 07b86786f34..6fb730119f5 100644 --- a/source3/include/printing.h +++ b/source3/include/printing.h @@ -63,7 +63,7 @@ enum {LPSTAT_OK, LPSTAT_STOPPED, LPSTAT_ERROR}; typedef struct { fstring message; - int qcount; + size_t qcount; int status; } print_status_struct; diff --git a/source3/printing/printing.c b/source3/printing/printing.c index e4bb1d84f69..d8124686302 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -991,7 +991,7 @@ static void print_unix_job(struct tevent_context *ev, struct traverse_struct { print_queue_struct *queue; - int qcount, snum, maxcount, total_jobs; + size_t qcount, snum, maxcount, total_jobs; const char *sharename; time_t lpq_time; const char *lprm_command; @@ -1010,7 +1010,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void struct traverse_struct *ts = (struct traverse_struct *)state; struct printjob pjob; uint32_t jobid; - int i = 0; + size_t i = 0; if ( key.dsize != sizeof(jobid) ) return 0; @@ -1408,7 +1408,7 @@ static void print_queue_update_internal(struct tevent_context *ev, struct printif *current_printif, char *lpq_command, char *lprm_command) { - int i, qcount; + size_t i, qcount; print_queue_struct *queue = NULL; print_status_struct status; print_status_struct old_status; @@ -1443,8 +1443,10 @@ static void print_queue_update_internal(struct tevent_context *ev, current_printif->type, lpq_command, &queue, &status); - DEBUG(3, ("print_queue_update_internal: %d job%s in queue for %s\n", - qcount, (qcount != 1) ? "s" : "", sharename)); + DBG_NOTICE("%zu job%s in queue for %s\n", + qcount, + (qcount != 1) ? "s" : "", + sharename); /* Sort the queue by submission time otherwise they are displayed in hash order. */ @@ -1519,15 +1521,20 @@ static void print_queue_update_internal(struct tevent_context *ev, SAFE_FREE(tstruct.queue); talloc_free(tmp_ctx); - DEBUG(10,("print_queue_update_internal: printer %s INFO/total_jobs = %d\n", - sharename, tstruct.total_jobs )); + DBG_DEBUG("printer %s INFO, total_jobs = %zu\n", + sharename, + tstruct.total_jobs); tdb_store_int32(pdb->tdb, "INFO/total_jobs", tstruct.total_jobs); get_queue_status(sharename, &old_status); - if (old_status.qcount != qcount) - DEBUG(10,("print_queue_update_internal: queue status change %d jobs -> %d jobs for printer %s\n", - old_status.qcount, qcount, sharename)); + if (old_status.qcount != qcount) { + DBG_DEBUG("Queue status change %zu jobs -> %zu jobs " + "for printer %s\n", + old_status.qcount, + qcount, + sharename); + } /* store the new queue status structure */ slprintf(keystr, sizeof(keystr)-1, "STATUS/%s", sharename); From a1a1f009ff8a038e9c6dfd649c4b775e1c791721 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Mar 2018 14:06:34 +0100 Subject: [PATCH 36/64] s3:spoolss: Fix size types This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 2f42e6d4c39..9e492d5a396 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -5006,7 +5006,7 @@ static WERROR string_array_from_driver_info(TALLOC_CTX *mem_ctx, const char *arch, int version) { - int i; + size_t i; size_t num_strings = 0; const char **array = NULL; From 8248f57e1cf4b562f8bebeaab5038cadd3f52612 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Mar 2018 14:51:28 +0100 Subject: [PATCH 37/64] s3:client: Fix size types This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source3/client/client.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/source3/client/client.c b/source3/client/client.c index 49d027ad4ac..23ed02d9cc0 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -186,16 +186,20 @@ static bool yesno(const char *p) number taken from the buffer. This may not equal the number written. ****************************************************************************/ -static int writefile(int f, char *b, int n) +static ssize_t writefile(int f, char *b, size_t n) { - int i; + size_t i = 0; + + if (n == 0) { + errno = EINVAL; + return -1; + } if (!translation) { return write(f,b,n); } - i = 0; - while (i < n) { + do { if (*b == '\r' && (i<(n-1)) && *(b+1) == '\n') { b++;i++; } @@ -204,9 +208,9 @@ static int writefile(int f, char *b, int n) } b++; i++; - } + } while (i < n); - return(i); + return (ssize_t)i; } /**************************************************************************** @@ -1092,7 +1096,10 @@ static int cmd_echo(void) static NTSTATUS writefile_sink(char *buf, size_t n, void *priv) { int *pfd = (int *)priv; - if (writefile(*pfd, buf, n) == -1) { + ssize_t rc; + + rc = writefile(*pfd, buf, n); + if (rc == -1) { return map_nt_error_from_unix(errno); } return NT_STATUS_OK; @@ -5954,7 +5961,7 @@ static char **completion_fn(const char *text, int start, int end) return NULL; } else { char **matches; - int i, len, samelen = 0, count=1; + size_t i, len, samelen = 0, count=1; matches = SMB_MALLOC_ARRAY(char *, MAX_COMPLETIONS); if (!matches) { From a3671ed333708ad9d685eb55cafdea942ed4c15c Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Mar 2018 18:36:13 +0100 Subject: [PATCH 38/64] s3:torture: Fix size types in make_nonstd_fd() This fixes compilation with -Wstrict-overflow=2. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source3/torture/wbc_async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/torture/wbc_async.c b/source3/torture/wbc_async.c index 1a7495acad8..a9020ddcda5 100644 --- a/source3/torture/wbc_async.c +++ b/source3/torture/wbc_async.c @@ -98,10 +98,10 @@ struct wb_context { static int make_nonstd_fd(int fd) { - int i; + size_t i; int sys_errno = 0; int fds[3]; - int num_fds = 0; + size_t num_fds = 0; if (fd == -1) { return -1; From 85e924c079adf3b0c5c2d7d34944a3652fa020e6 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 23 Mar 2018 09:29:55 +0100 Subject: [PATCH 39/64] s3:modules: Update getdate.y to work with newer bison versions Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy Reviewed-by: Jeremy Allison --- source3/modules/getdate.y | 243 +++++++++++++++++++++++----------------------- 1 file changed, 121 insertions(+), 122 deletions(-) diff --git a/source3/modules/getdate.y b/source3/modules/getdate.y index 2e49f15b87f..3ac9f26abfc 100644 --- a/source3/modules/getdate.y +++ b/source3/modules/getdate.y @@ -105,7 +105,7 @@ typedef struct enum { MERam, MERpm, MER24 }; /* Information passed to and from the parser. */ -typedef struct +struct parser_control { /* The input string remaining to be parsed. */ const char *input; @@ -151,16 +151,15 @@ typedef struct /* Table of local time zone abbrevations, terminated by a null entry. */ table local_time_zone_table[3]; -} parser_control; - -#define PC (* (parser_control *) parm) -#define YYLEX_PARAM parm -#define YYPARSE_PARAM parm +}; %} +%lex-param {struct parser_control *pc} +%parse-param {struct parser_control *pc} + /* We want a reentrant parser. */ -%pure_parser +%pure-parser /* This grammar has 13 shift/reduce conflicts. */ %expect 13 @@ -173,8 +172,8 @@ typedef struct %{ -static int yyerror(const char *); -static int yylex(YYSTYPE *, parser_control *); +static int yyerror(struct parser_control *, const char *); +static int yylex(YYSTYPE *, struct parser_control *); %} @@ -196,100 +195,100 @@ spec: item: time - { PC.times_seen++; } + { pc->times_seen++; } | local_zone - { PC.local_zones_seen++; } + { pc->local_zones_seen++; } | zone - { PC.zones_seen++; } + { pc->zones_seen++; } | date - { PC.dates_seen++; } + { pc->dates_seen++; } | day - { PC.days_seen++; } + { pc->days_seen++; } | rel - { PC.rels_seen++; } + { pc->rels_seen++; } | number ; time: tUNUMBER tMERIDIAN { - PC.hour = $1.value; - PC.minutes = 0; - PC.seconds = 0; - PC.meridian = $2; + pc->hour = $1.value; + pc->minutes = 0; + pc->seconds = 0; + pc->meridian = $2; } | tUNUMBER ':' tUNUMBER o_merid { - PC.hour = $1.value; - PC.minutes = $3.value; - PC.seconds = 0; - PC.meridian = $4; + pc->hour = $1.value; + pc->minutes = $3.value; + pc->seconds = 0; + pc->meridian = $4; } | tUNUMBER ':' tUNUMBER tSNUMBER { - PC.hour = $1.value; - PC.minutes = $3.value; - PC.meridian = MER24; - PC.zones_seen++; - PC.time_zone = $4.value % 100 + ($4.value / 100) * 60; + pc->hour = $1.value; + pc->minutes = $3.value; + pc->meridian = MER24; + pc->zones_seen++; + pc->time_zone = $4.value % 100 + ($4.value / 100) * 60; } | tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid { - PC.hour = $1.value; - PC.minutes = $3.value; - PC.seconds = $5.value; - PC.meridian = $6; + pc->hour = $1.value; + pc->minutes = $3.value; + pc->seconds = $5.value; + pc->meridian = $6; } | tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER { - PC.hour = $1.value; - PC.minutes = $3.value; - PC.seconds = $5.value; - PC.meridian = MER24; - PC.zones_seen++; - PC.time_zone = $6.value % 100 + ($6.value / 100) * 60; + pc->hour = $1.value; + pc->minutes = $3.value; + pc->seconds = $5.value; + pc->meridian = MER24; + pc->zones_seen++; + pc->time_zone = $6.value % 100 + ($6.value / 100) * 60; } ; local_zone: tLOCAL_ZONE - { PC.local_isdst = $1; } + { pc->local_isdst = $1; } | tLOCAL_ZONE tDST - { PC.local_isdst = $1 < 0 ? 1 : $1 + 1; } + { pc->local_isdst = $1 < 0 ? 1 : $1 + 1; } ; zone: tZONE - { PC.time_zone = $1; } + { pc->time_zone = $1; } | tDAYZONE - { PC.time_zone = $1 + 60; } + { pc->time_zone = $1 + 60; } | tZONE tDST - { PC.time_zone = $1 + 60; } + { pc->time_zone = $1 + 60; } ; day: tDAY { - PC.day_ordinal = 1; - PC.day_number = $1; + pc->day_ordinal = 1; + pc->day_number = $1; } | tDAY ',' { - PC.day_ordinal = 1; - PC.day_number = $1; + pc->day_ordinal = 1; + pc->day_number = $1; } | tUNUMBER tDAY { - PC.day_ordinal = $1.value; - PC.day_number = $2; + pc->day_ordinal = $1.value; + pc->day_number = $2; } ; date: tUNUMBER '/' tUNUMBER { - PC.month = $1.value; - PC.day = $3.value; + pc->month = $1.value; + pc->day = $3.value; } | tUNUMBER '/' tUNUMBER '/' tUNUMBER { @@ -300,139 +299,139 @@ date: you want portability, use the ISO 8601 format. */ if (4 <= $1.digits) { - PC.year = $1; - PC.month = $3.value; - PC.day = $5.value; + pc->year = $1; + pc->month = $3.value; + pc->day = $5.value; } else { - PC.month = $1.value; - PC.day = $3.value; - PC.year = $5; + pc->month = $1.value; + pc->day = $3.value; + pc->year = $5; } } | tUNUMBER tSNUMBER tSNUMBER { /* ISO 8601 format. YYYY-MM-DD. */ - PC.year = $1; - PC.month = -$2.value; - PC.day = -$3.value; + pc->year = $1; + pc->month = -$2.value; + pc->day = -$3.value; } | tUNUMBER tMONTH tSNUMBER { /* e.g. 17-JUN-1992. */ - PC.day = $1.value; - PC.month = $2; - PC.year.value = -$3.value; - PC.year.digits = $3.digits; + pc->day = $1.value; + pc->month = $2; + pc->year.value = -$3.value; + pc->year.digits = $3.digits; } | tMONTH tUNUMBER { - PC.month = $1; - PC.day = $2.value; + pc->month = $1; + pc->day = $2.value; } | tMONTH tUNUMBER ',' tUNUMBER { - PC.month = $1; - PC.day = $2.value; - PC.year = $4; + pc->month = $1; + pc->day = $2.value; + pc->year = $4; } | tUNUMBER tMONTH { - PC.day = $1.value; - PC.month = $2; + pc->day = $1.value; + pc->month = $2; } | tUNUMBER tMONTH tUNUMBER { - PC.day = $1.value; - PC.month = $2; - PC.year = $3; + pc->day = $1.value; + pc->month = $2; + pc->year = $3; } ; rel: relunit tAGO { - PC.rel_seconds = -PC.rel_seconds; - PC.rel_minutes = -PC.rel_minutes; - PC.rel_hour = -PC.rel_hour; - PC.rel_day = -PC.rel_day; - PC.rel_month = -PC.rel_month; - PC.rel_year = -PC.rel_year; + pc->rel_seconds = -pc->rel_seconds; + pc->rel_minutes = -pc->rel_minutes; + pc->rel_hour = -pc->rel_hour; + pc->rel_day = -pc->rel_day; + pc->rel_month = -pc->rel_month; + pc->rel_year = -pc->rel_year; } | relunit ; relunit: tUNUMBER tYEAR_UNIT - { PC.rel_year += $1.value * $2; } + { pc->rel_year += $1.value * $2; } | tSNUMBER tYEAR_UNIT - { PC.rel_year += $1.value * $2; } + { pc->rel_year += $1.value * $2; } | tYEAR_UNIT - { PC.rel_year += $1; } + { pc->rel_year += $1; } | tUNUMBER tMONTH_UNIT - { PC.rel_month += $1.value * $2; } + { pc->rel_month += $1.value * $2; } | tSNUMBER tMONTH_UNIT - { PC.rel_month += $1.value * $2; } + { pc->rel_month += $1.value * $2; } | tMONTH_UNIT - { PC.rel_month += $1; } + { pc->rel_month += $1; } | tUNUMBER tDAY_UNIT - { PC.rel_day += $1.value * $2; } + { pc->rel_day += $1.value * $2; } | tSNUMBER tDAY_UNIT - { PC.rel_day += $1.value * $2; } + { pc->rel_day += $1.value * $2; } | tDAY_UNIT - { PC.rel_day += $1; } + { pc->rel_day += $1; } | tUNUMBER tHOUR_UNIT - { PC.rel_hour += $1.value * $2; } + { pc->rel_hour += $1.value * $2; } | tSNUMBER tHOUR_UNIT - { PC.rel_hour += $1.value * $2; } + { pc->rel_hour += $1.value * $2; } | tHOUR_UNIT - { PC.rel_hour += $1; } + { pc->rel_hour += $1; } | tUNUMBER tMINUTE_UNIT - { PC.rel_minutes += $1.value * $2; } + { pc->rel_minutes += $1.value * $2; } | tSNUMBER tMINUTE_UNIT - { PC.rel_minutes += $1.value * $2; } + { pc->rel_minutes += $1.value * $2; } | tMINUTE_UNIT - { PC.rel_minutes += $1; } + { pc->rel_minutes += $1; } | tUNUMBER tSEC_UNIT - { PC.rel_seconds += $1.value * $2; } + { pc->rel_seconds += $1.value * $2; } | tSNUMBER tSEC_UNIT - { PC.rel_seconds += $1.value * $2; } + { pc->rel_seconds += $1.value * $2; } | tSEC_UNIT - { PC.rel_seconds += $1; } + { pc->rel_seconds += $1; } ; number: tUNUMBER { - if (PC.dates_seen - && ! PC.rels_seen && (PC.times_seen || 2 < $1.digits)) - PC.year = $1; + if (pc->dates_seen + && ! pc->rels_seen && (pc->times_seen || 2 < $1.digits)) + pc->year = $1; else { if (4 < $1.digits) { - PC.dates_seen++; - PC.day = $1.value % 100; - PC.month = ($1.value / 100) % 100; - PC.year.value = $1.value / 10000; - PC.year.digits = $1.digits - 4; + pc->dates_seen++; + pc->day = $1.value % 100; + pc->month = ($1.value / 100) % 100; + pc->year.value = $1.value / 10000; + pc->year.digits = $1.digits - 4; } else { - PC.times_seen++; + pc->times_seen++; if ($1.digits <= 2) { - PC.hour = $1.value; - PC.minutes = 0; + pc->hour = $1.value; + pc->minutes = 0; } else { - PC.hour = $1.value / 100; - PC.minutes = $1.value % 100; + pc->hour = $1.value / 100; + pc->minutes = $1.value % 100; } - PC.seconds = 0; - PC.meridian = MER24; + pc->seconds = 0; + pc->meridian = MER24; } } } @@ -674,7 +673,7 @@ to_year (textint textyear) } static table const * -lookup_zone (parser_control const *pc, char const *name) +lookup_zone (struct parser_control const *pc, char const *name) { table const *tp; @@ -718,7 +717,7 @@ tm_diff (struct tm const *a, struct tm const *b) #endif /* ! HAVE_TM_GMTOFF */ static table const * -lookup_word (parser_control const *pc, char *word) +lookup_word (struct parser_control const *pc, char *word) { char *p; char *q; @@ -787,7 +786,7 @@ lookup_word (parser_control const *pc, char *word) } static int -yylex (YYSTYPE *lvalp, parser_control *pc) +yylex (YYSTYPE *lvalp, struct parser_control *pc) { unsigned char c; size_t count; @@ -829,18 +828,18 @@ yylex (YYSTYPE *lvalp, parser_control *pc) if (ISALPHA (c)) { char buff[20]; - char *p = buff; + size_t i = 0; table const *tp; do { - if (p < buff + sizeof buff - 1) - *p++ = c; + if (i < 20) + buff[i++] = c; c = *++pc->input; } while (ISALPHA (c) || c == '.'); - *p = '\0'; + buff[i] = '\0'; tp = lookup_word (pc, buff); if (! tp) return '?'; @@ -867,7 +866,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) /* Do nothing if the parser reports an error. */ static int -yyerror (const char *s ATTRIBUTE_UNUSED) +yyerror (struct parser_control *pc ATTRIBUTE_UNUSED, const char *s ATTRIBUTE_UNUSED) { return 0; } @@ -883,7 +882,7 @@ get_date (const char *p, const time_t *now) struct tm *tmp = localtime (&Start); struct tm tm; struct tm tm0; - parser_control pc; + struct parser_control pc; if (! tmp) return -1; From 6f9b7b5749e2bd68b319892cacfe470e9bba2c03 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 23 Mar 2018 09:30:27 +0100 Subject: [PATCH 40/64] s3:modules: Generate new getdate.c with bison bison -o source3/modules/getdate.c source3/modules/getdate.y Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy Reviewed-by: Jeremy Allison --- source3/modules/getdate.c | 1874 ++++++++++++++++++++++----------------------- 1 file changed, 897 insertions(+), 977 deletions(-) diff --git a/source3/modules/getdate.c b/source3/modules/getdate.c index 7a5d68ee6a3..ccc9b10e6f7 100644 --- a/source3/modules/getdate.c +++ b/source3/modules/getdate.c @@ -1,14 +1,13 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + 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 2, or (at your option) - any later version. + 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 @@ -16,9 +15,7 @@ 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, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -47,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "3.0.4" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,58 +52,17 @@ /* Pure parsers. */ #define YYPURE 1 -/* Using locations. */ -#define YYLSP_NEEDED 0 +/* Push parsers. */ +#define YYPUSH 0 - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - tAGO = 258, - tDST = 259, - tDAY = 260, - tDAY_UNIT = 261, - tDAYZONE = 262, - tHOUR_UNIT = 263, - tLOCAL_ZONE = 264, - tMERIDIAN = 265, - tMINUTE_UNIT = 266, - tMONTH = 267, - tMONTH_UNIT = 268, - tSEC_UNIT = 269, - tYEAR_UNIT = 270, - tZONE = 271, - tSNUMBER = 272, - tUNUMBER = 273 - }; -#endif -/* Tokens. */ -#define tAGO 258 -#define tDST 259 -#define tDAY 260 -#define tDAY_UNIT 261 -#define tDAYZONE 262 -#define tHOUR_UNIT 263 -#define tLOCAL_ZONE 264 -#define tMERIDIAN 265 -#define tMINUTE_UNIT 266 -#define tMONTH 267 -#define tMONTH_UNIT 268 -#define tSEC_UNIT 269 -#define tYEAR_UNIT 270 -#define tZONE 271 -#define tSNUMBER 272 -#define tUNUMBER 273 +/* Pull parsers. */ +#define YYPULL 1 /* Copy the first part of user declarations. */ -#line 1 "getdate.y" +#line 1 "source3/modules/getdate.y" /* yacc.c:339 */ /* Parse a string into an internal time stamp. Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. @@ -214,7 +170,7 @@ typedef struct enum { MERam, MERpm, MER24 }; /* Information passed to and from the parser. */ -typedef struct +struct parser_control { /* The input string remaining to be parsed. */ const char *input; @@ -260,18 +216,18 @@ typedef struct /* Table of local time zone abbrevations, terminated by a null entry. */ table local_time_zone_table[3]; -} parser_control; - -#define PC (* (parser_control *) parm) -#define YYLEX_PARAM parm -#define YYPARSE_PARAM parm +}; +#line 223 "source3/modules/getdate.c" /* yacc.c:339 */ -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif +# ifndef YY_NULLPTR +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -281,39 +237,72 @@ typedef struct # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 + +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; +#endif + +/* Token type. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + enum yytokentype + { + tAGO = 258, + tDST = 259, + tDAY = 260, + tDAY_UNIT = 261, + tDAYZONE = 262, + tHOUR_UNIT = 263, + tLOCAL_ZONE = 264, + tMERIDIAN = 265, + tMINUTE_UNIT = 266, + tMONTH = 267, + tMONTH_UNIT = 268, + tSEC_UNIT = 269, + tYEAR_UNIT = 270, + tZONE = 271, + tSNUMBER = 272, + tUNUMBER = 273 + }; #endif +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 169 "getdate.y" + +union YYSTYPE { +#line 168 "source3/modules/getdate.y" /* yacc.c:355 */ + int intval; textint textintval; -} -/* Line 187 of yacc.c. */ -#line 298 "getdate.c" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + +#line 284 "source3/modules/getdate.c" /* yacc.c:355 */ +}; + +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif -/* Copy the second part of user declarations. */ -#line 174 "getdate.y" +int yyparse (struct parser_control *pc); + -static int yyerror(const char *); -static int yylex(YYSTYPE *, parser_control *); +/* Copy the second part of user declarations. */ +#line 173 "source3/modules/getdate.y" /* yacc.c:358 */ +static int yyerror(struct parser_control *, const char *); +static int yylex(YYSTYPE *, struct parser_control *); -/* Line 216 of yacc.c. */ -#line 317 "getdate.c" + +#line 306 "source3/modules/getdate.c" /* yacc.c:358 */ #ifdef short # undef short @@ -327,11 +316,8 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -351,8 +337,7 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -363,42 +348,71 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (i) - int i; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return i; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif + #if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -416,11 +430,11 @@ YYID (i) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -428,8 +442,8 @@ YYID (i) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -443,25 +457,23 @@ YYID (i) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -471,14 +483,14 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) @@ -489,42 +501,46 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ @@ -536,17 +552,19 @@ union yyalloc #define YYNNTS 12 /* YYNRULES -- Number of rules. */ #define YYNRULES 54 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 64 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 273 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -580,52 +598,19 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 4, 7, 9, 11, 13, 15, 17, - 19, 21, 24, 29, 34, 41, 48, 50, 53, 55, - 57, 60, 62, 65, 68, 72, 78, 82, 86, 89, - 94, 97, 101, 104, 106, 109, 112, 114, 117, 120, - 122, 125, 128, 130, 133, 136, 138, 141, 144, 146, - 149, 152, 154, 156, 157 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 23, 0, -1, -1, 23, 24, -1, 25, -1, 26, - -1, 27, -1, 29, -1, 28, -1, 30, -1, 32, - -1, 18, 10, -1, 18, 19, 18, 33, -1, 18, - 19, 18, 17, -1, 18, 19, 18, 19, 18, 33, - -1, 18, 19, 18, 19, 18, 17, -1, 9, -1, - 9, 4, -1, 16, -1, 7, -1, 16, 4, -1, - 5, -1, 5, 20, -1, 18, 5, -1, 18, 21, - 18, -1, 18, 21, 18, 21, 18, -1, 18, 17, - 17, -1, 18, 12, 17, -1, 12, 18, -1, 12, - 18, 20, 18, -1, 18, 12, -1, 18, 12, 18, - -1, 31, 3, -1, 31, -1, 18, 15, -1, 17, - 15, -1, 15, -1, 18, 13, -1, 17, 13, -1, - 13, -1, 18, 6, -1, 17, 6, -1, 6, -1, - 18, 8, -1, 17, 8, -1, 8, -1, 18, 11, - -1, 17, 11, -1, 11, -1, 18, 14, -1, 17, - 14, -1, 14, -1, 18, -1, -1, 10, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 192, 192, 194, 198, 200, 202, 204, 206, 208, - 210, 214, 221, 228, 236, 243, 255, 257, 262, 264, - 266, 271, 276, 281, 289, 294, 314, 321, 329, 334, - 340, 345, 354, 363, 367, 369, 371, 373, 375, 377, - 379, 381, 383, 385, 387, 389, 391, 393, 395, 397, - 399, 401, 406, 443, 444 + 0, 191, 191, 193, 197, 199, 201, 203, 205, 207, + 209, 213, 220, 227, 235, 242, 254, 256, 261, 263, + 265, 270, 275, 280, 288, 293, 313, 320, 328, 333, + 339, 344, 353, 362, 366, 368, 370, 372, 374, 376, + 378, 380, 382, 384, 386, 388, 390, 392, 394, 396, + 398, 400, 405, 442, 443 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -635,13 +620,13 @@ static const char *const yytname[] = "tMONTH", "tMONTH_UNIT", "tSEC_UNIT", "tYEAR_UNIT", "tZONE", "tSNUMBER", "tUNUMBER", "':'", "','", "'/'", "$accept", "spec", "item", "time", "local_zone", "zone", "day", "date", "rel", "relunit", "number", - "o_merid", 0 + "o_merid", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -650,31 +635,32 @@ static const yytype_uint16 yytoknum[] = }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 22, 23, 23, 24, 24, 24, 24, 24, 24, - 24, 25, 25, 25, 25, 25, 26, 26, 27, 27, - 27, 28, 28, 28, 29, 29, 29, 29, 29, 29, - 29, 29, 30, 30, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 32, 33, 33 -}; +#define YYPACT_NINF -17 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-17))) + +#define YYTABLE_NINF -1 + +#define yytable_value_is_error(Yytable_value) \ + 0 + + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +static const yytype_int8 yypact[] = { - 0, 2, 0, 2, 1, 1, 1, 1, 1, 1, - 1, 2, 4, 4, 6, 6, 1, 2, 1, 1, - 2, 1, 2, 2, 3, 5, 3, 3, 2, 4, - 2, 3, 2, 1, 2, 2, 1, 2, 2, 1, - 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, - 2, 1, 1, 0, 1 + -17, 0, -17, 1, -17, -17, -17, 19, -17, -14, + -17, -17, -17, 32, 26, 14, -17, -17, -17, -17, + -17, -17, -17, 27, -17, -17, -17, 22, -17, -17, + -17, -17, -17, -17, -17, -17, -17, -17, -17, -17, + -16, -17, -17, -17, 29, 25, 30, -17, 31, -17, + -17, -17, 28, 23, -17, -17, -17, 33, -17, 34, + -7, -17, -17, -17 }; -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_uint8 yydefact[] = { 2, 0, 1, 21, 42, 19, 45, 16, 48, 0, @@ -686,39 +672,23 @@ static const yytype_uint8 yydefact[] = 53, 25, 15, 14 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 1, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 58 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -17 -static const yytype_int8 yypact[] = + /* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = { - -17, 0, -17, 1, -17, -17, -17, 19, -17, -14, - -17, -17, -17, 32, 26, 14, -17, -17, -17, -17, - -17, -17, -17, 27, -17, -17, -17, 22, -17, -17, -17, -17, -17, -17, -17, -17, -17, -17, -17, -17, - -16, -17, -17, -17, 29, 25, 30, -17, 31, -17, - -17, -17, 28, 23, -17, -17, -17, 33, -17, 34, - -7, -17, -17, -17 + -17, -10 }; -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = { - -17, -17, -17, -17, -17, -17, -17, -17, -17, -17, - -17, -10 + -1, 1, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 58 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint8 yytable[] = { 2, 49, 50, 55, 27, 3, 4, 5, 6, 7, @@ -739,8 +709,8 @@ static const yytype_uint8 yycheck[] = 60, 18, 18 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { 0, 23, 0, 5, 6, 7, 8, 9, 11, 12, @@ -752,95 +722,63 @@ static const yytype_uint8 yystos[] = 18, 18, 17, 33 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 22, 23, 23, 24, 24, 24, 24, 24, 24, + 24, 25, 25, 25, 25, 25, 26, 26, 27, 27, + 27, 28, 28, 28, 29, 29, 29, 29, 29, 29, + 29, 29, 30, 30, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 32, 33, 33 +}; -#define YYFAIL goto yyerrlab + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 0, 2, 1, 1, 1, 1, 1, 1, + 1, 2, 4, 4, 6, 6, 1, 2, 1, 1, + 2, 1, 2, 2, 3, 5, 3, 3, 2, 4, + 2, 3, 2, 1, 2, 2, 1, 2, 2, 1, + 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, + 2, 1, 1, 0, 1 +}; -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif +#define YYRECOVERING() (!!yyerrstatus) +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (pc, YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (0) + +/* Error token number */ +#define YYTERROR 1 +#define YYERRCODE 256 -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval) -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -850,54 +788,47 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value, pc); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parser_control *pc) { + FILE *yyo = yyoutput; + YYUSE (yyo); + YYUSE (pc); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -905,24 +836,13 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parser_control *pc) { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); + yy_symbol_value_print (yyoutput, yytype, yyvaluep, pc); YYFPRINTF (yyoutput, ")"); } @@ -931,66 +851,54 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, struct parser_control *pc) { + unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + , pc); + YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule, pc); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1004,7 +912,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1019,7 +927,6 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - #if YYERROR_VERBOSE @@ -1028,15 +935,8 @@ int yydebug; # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1052,16 +952,8 @@ yystrlen (yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1091,28 +983,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') { - goto do_not_strip_quotes; - } - FALL_THROUGH; - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1123,165 +1014,159 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyssp, int yytoken) +{ + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULLPTR; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + + /* There are many possibilities here to consider: + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } + int yyn = yypact[*yyssp]; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + } + } + } - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } - if (yysize_overflow) - return YYSIZE_MAXIMUM; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; } + + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct parser_control *pc) { YYUSE (yyvaluep); - + YYUSE (pc); if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } - - -/* Prevent warnings from -Wmissing-prototypes. */ - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - @@ -1290,99 +1175,76 @@ int yyparse (); | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int -yyparse (void) -#else -int -yyparse () - -#endif -#endif +yyparse (struct parser_control *pc) { - /* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ -YYSTYPE yylval; -/* Number of syntax errors so far. */ -int yynerrs; +/* The semantic value of the lookahead symbol. */ +/* Default value used for initialization, for pacifying older GCCs + or non-GCC compilers. */ +YY_INITIAL_VALUE (static YYSTYPE yyval_default;) +YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* Number of syntax errors so far. */ + int yynerrs; - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The stacks and their tools: + 'yyss': related to states. + 'yyvs': related to semantic values. + Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; - YYSIZE_T yystacksize = YYINITDEPTH; + YYSIZE_T yystacksize; + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; - + yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; /*------------------------------------------------------------. @@ -1403,25 +1265,23 @@ int yynerrs; #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1429,23 +1289,22 @@ int yynerrs; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -1453,16 +1312,18 @@ int yynerrs; yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -1471,20 +1332,20 @@ int yynerrs; yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (&yylval, pc); } if (yychar <= YYEOF) @@ -1506,29 +1367,27 @@ int yynerrs; yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -1551,7 +1410,7 @@ int yynerrs; yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1565,376 +1424,435 @@ int yynerrs; switch (yyn) { case 4: -#line 199 "getdate.y" - { PC.times_seen++; ;} +#line 198 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->times_seen++; } +#line 1430 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 5: -#line 201 "getdate.y" - { PC.local_zones_seen++; ;} +#line 200 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->local_zones_seen++; } +#line 1436 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 6: -#line 203 "getdate.y" - { PC.zones_seen++; ;} +#line 202 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->zones_seen++; } +#line 1442 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 7: -#line 205 "getdate.y" - { PC.dates_seen++; ;} +#line 204 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->dates_seen++; } +#line 1448 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 8: -#line 207 "getdate.y" - { PC.days_seen++; ;} +#line 206 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->days_seen++; } +#line 1454 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 9: -#line 209 "getdate.y" - { PC.rels_seen++; ;} +#line 208 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rels_seen++; } +#line 1460 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 11: -#line 215 "getdate.y" +#line 214 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.hour = (yyvsp[(1) - (2)].textintval).value; - PC.minutes = 0; - PC.seconds = 0; - PC.meridian = (yyvsp[(2) - (2)].intval); - ;} + pc->hour = (yyvsp[-1].textintval).value; + pc->minutes = 0; + pc->seconds = 0; + pc->meridian = (yyvsp[0].intval); + } +#line 1471 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 12: -#line 222 "getdate.y" +#line 221 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.hour = (yyvsp[(1) - (4)].textintval).value; - PC.minutes = (yyvsp[(3) - (4)].textintval).value; - PC.seconds = 0; - PC.meridian = (yyvsp[(4) - (4)].intval); - ;} + pc->hour = (yyvsp[-3].textintval).value; + pc->minutes = (yyvsp[-1].textintval).value; + pc->seconds = 0; + pc->meridian = (yyvsp[0].intval); + } +#line 1482 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 13: -#line 229 "getdate.y" +#line 228 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.hour = (yyvsp[(1) - (4)].textintval).value; - PC.minutes = (yyvsp[(3) - (4)].textintval).value; - PC.meridian = MER24; - PC.zones_seen++; - PC.time_zone = (yyvsp[(4) - (4)].textintval).value % 100 + ((yyvsp[(4) - (4)].textintval).value / 100) * 60; - ;} + pc->hour = (yyvsp[-3].textintval).value; + pc->minutes = (yyvsp[-1].textintval).value; + pc->meridian = MER24; + pc->zones_seen++; + pc->time_zone = (yyvsp[0].textintval).value % 100 + ((yyvsp[0].textintval).value / 100) * 60; + } +#line 1494 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 14: -#line 237 "getdate.y" +#line 236 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.hour = (yyvsp[(1) - (6)].textintval).value; - PC.minutes = (yyvsp[(3) - (6)].textintval).value; - PC.seconds = (yyvsp[(5) - (6)].textintval).value; - PC.meridian = (yyvsp[(6) - (6)].intval); - ;} + pc->hour = (yyvsp[-5].textintval).value; + pc->minutes = (yyvsp[-3].textintval).value; + pc->seconds = (yyvsp[-1].textintval).value; + pc->meridian = (yyvsp[0].intval); + } +#line 1505 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 15: -#line 244 "getdate.y" +#line 243 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.hour = (yyvsp[(1) - (6)].textintval).value; - PC.minutes = (yyvsp[(3) - (6)].textintval).value; - PC.seconds = (yyvsp[(5) - (6)].textintval).value; - PC.meridian = MER24; - PC.zones_seen++; - PC.time_zone = (yyvsp[(6) - (6)].textintval).value % 100 + ((yyvsp[(6) - (6)].textintval).value / 100) * 60; - ;} + pc->hour = (yyvsp[-5].textintval).value; + pc->minutes = (yyvsp[-3].textintval).value; + pc->seconds = (yyvsp[-1].textintval).value; + pc->meridian = MER24; + pc->zones_seen++; + pc->time_zone = (yyvsp[0].textintval).value % 100 + ((yyvsp[0].textintval).value / 100) * 60; + } +#line 1518 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 16: -#line 256 "getdate.y" - { PC.local_isdst = (yyvsp[(1) - (1)].intval); ;} +#line 255 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->local_isdst = (yyvsp[0].intval); } +#line 1524 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 17: -#line 258 "getdate.y" - { PC.local_isdst = (yyvsp[(1) - (2)].intval) < 0 ? 1 : (yyvsp[(1) - (2)].intval) + 1; ;} +#line 257 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->local_isdst = (yyvsp[-1].intval) < 0 ? 1 : (yyvsp[-1].intval) + 1; } +#line 1530 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 18: -#line 263 "getdate.y" - { PC.time_zone = (yyvsp[(1) - (1)].intval); ;} +#line 262 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->time_zone = (yyvsp[0].intval); } +#line 1536 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 19: -#line 265 "getdate.y" - { PC.time_zone = (yyvsp[(1) - (1)].intval) + 60; ;} +#line 264 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->time_zone = (yyvsp[0].intval) + 60; } +#line 1542 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 20: -#line 267 "getdate.y" - { PC.time_zone = (yyvsp[(1) - (2)].intval) + 60; ;} +#line 266 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->time_zone = (yyvsp[-1].intval) + 60; } +#line 1548 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 21: -#line 272 "getdate.y" +#line 271 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.day_ordinal = 1; - PC.day_number = (yyvsp[(1) - (1)].intval); - ;} + pc->day_ordinal = 1; + pc->day_number = (yyvsp[0].intval); + } +#line 1557 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 22: -#line 277 "getdate.y" +#line 276 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.day_ordinal = 1; - PC.day_number = (yyvsp[(1) - (2)].intval); - ;} + pc->day_ordinal = 1; + pc->day_number = (yyvsp[-1].intval); + } +#line 1566 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 23: -#line 282 "getdate.y" +#line 281 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.day_ordinal = (yyvsp[(1) - (2)].textintval).value; - PC.day_number = (yyvsp[(2) - (2)].intval); - ;} + pc->day_ordinal = (yyvsp[-1].textintval).value; + pc->day_number = (yyvsp[0].intval); + } +#line 1575 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 24: -#line 290 "getdate.y" +#line 289 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.month = (yyvsp[(1) - (3)].textintval).value; - PC.day = (yyvsp[(3) - (3)].textintval).value; - ;} + pc->month = (yyvsp[-2].textintval).value; + pc->day = (yyvsp[0].textintval).value; + } +#line 1584 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 25: -#line 295 "getdate.y" +#line 294 "source3/modules/getdate.y" /* yacc.c:1646 */ { /* Interpret as YYYY/MM/DD if the first value has 4 or more digits, otherwise as MM/DD/YY. The goal in recognizing YYYY/MM/DD is solely to support legacy machine-generated dates like those in an RCS log listing. If you want portability, use the ISO 8601 format. */ - if (4 <= (yyvsp[(1) - (5)].textintval).digits) + if (4 <= (yyvsp[-4].textintval).digits) { - PC.year = (yyvsp[(1) - (5)].textintval); - PC.month = (yyvsp[(3) - (5)].textintval).value; - PC.day = (yyvsp[(5) - (5)].textintval).value; + pc->year = (yyvsp[-4].textintval); + pc->month = (yyvsp[-2].textintval).value; + pc->day = (yyvsp[0].textintval).value; } else { - PC.month = (yyvsp[(1) - (5)].textintval).value; - PC.day = (yyvsp[(3) - (5)].textintval).value; - PC.year = (yyvsp[(5) - (5)].textintval); + pc->month = (yyvsp[-4].textintval).value; + pc->day = (yyvsp[-2].textintval).value; + pc->year = (yyvsp[0].textintval); } - ;} + } +#line 1608 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 26: -#line 315 "getdate.y" +#line 314 "source3/modules/getdate.y" /* yacc.c:1646 */ { /* ISO 8601 format. YYYY-MM-DD. */ - PC.year = (yyvsp[(1) - (3)].textintval); - PC.month = -(yyvsp[(2) - (3)].textintval).value; - PC.day = -(yyvsp[(3) - (3)].textintval).value; - ;} + pc->year = (yyvsp[-2].textintval); + pc->month = -(yyvsp[-1].textintval).value; + pc->day = -(yyvsp[0].textintval).value; + } +#line 1619 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 27: -#line 322 "getdate.y" +#line 321 "source3/modules/getdate.y" /* yacc.c:1646 */ { /* e.g. 17-JUN-1992. */ - PC.day = (yyvsp[(1) - (3)].textintval).value; - PC.month = (yyvsp[(2) - (3)].intval); - PC.year.value = -(yyvsp[(3) - (3)].textintval).value; - PC.year.digits = (yyvsp[(3) - (3)].textintval).digits; - ;} + pc->day = (yyvsp[-2].textintval).value; + pc->month = (yyvsp[-1].intval); + pc->year.value = -(yyvsp[0].textintval).value; + pc->year.digits = (yyvsp[0].textintval).digits; + } +#line 1631 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 28: -#line 330 "getdate.y" +#line 329 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.month = (yyvsp[(1) - (2)].intval); - PC.day = (yyvsp[(2) - (2)].textintval).value; - ;} + pc->month = (yyvsp[-1].intval); + pc->day = (yyvsp[0].textintval).value; + } +#line 1640 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 29: -#line 335 "getdate.y" +#line 334 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.month = (yyvsp[(1) - (4)].intval); - PC.day = (yyvsp[(2) - (4)].textintval).value; - PC.year = (yyvsp[(4) - (4)].textintval); - ;} + pc->month = (yyvsp[-3].intval); + pc->day = (yyvsp[-2].textintval).value; + pc->year = (yyvsp[0].textintval); + } +#line 1650 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 30: -#line 341 "getdate.y" +#line 340 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.day = (yyvsp[(1) - (2)].textintval).value; - PC.month = (yyvsp[(2) - (2)].intval); - ;} + pc->day = (yyvsp[-1].textintval).value; + pc->month = (yyvsp[0].intval); + } +#line 1659 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 31: -#line 346 "getdate.y" +#line 345 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.day = (yyvsp[(1) - (3)].textintval).value; - PC.month = (yyvsp[(2) - (3)].intval); - PC.year = (yyvsp[(3) - (3)].textintval); - ;} + pc->day = (yyvsp[-2].textintval).value; + pc->month = (yyvsp[-1].intval); + pc->year = (yyvsp[0].textintval); + } +#line 1669 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 32: -#line 355 "getdate.y" +#line 354 "source3/modules/getdate.y" /* yacc.c:1646 */ { - PC.rel_seconds = -PC.rel_seconds; - PC.rel_minutes = -PC.rel_minutes; - PC.rel_hour = -PC.rel_hour; - PC.rel_day = -PC.rel_day; - PC.rel_month = -PC.rel_month; - PC.rel_year = -PC.rel_year; - ;} + pc->rel_seconds = -pc->rel_seconds; + pc->rel_minutes = -pc->rel_minutes; + pc->rel_hour = -pc->rel_hour; + pc->rel_day = -pc->rel_day; + pc->rel_month = -pc->rel_month; + pc->rel_year = -pc->rel_year; + } +#line 1682 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 34: -#line 368 "getdate.y" - { PC.rel_year += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 367 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_year += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1688 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 35: -#line 370 "getdate.y" - { PC.rel_year += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 369 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_year += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1694 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 36: -#line 372 "getdate.y" - { PC.rel_year += (yyvsp[(1) - (1)].intval); ;} +#line 371 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_year += (yyvsp[0].intval); } +#line 1700 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 37: -#line 374 "getdate.y" - { PC.rel_month += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 373 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_month += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1706 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 38: -#line 376 "getdate.y" - { PC.rel_month += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 375 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_month += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1712 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 39: -#line 378 "getdate.y" - { PC.rel_month += (yyvsp[(1) - (1)].intval); ;} +#line 377 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_month += (yyvsp[0].intval); } +#line 1718 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 40: -#line 380 "getdate.y" - { PC.rel_day += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 379 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_day += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1724 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 41: -#line 382 "getdate.y" - { PC.rel_day += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 381 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_day += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1730 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 42: -#line 384 "getdate.y" - { PC.rel_day += (yyvsp[(1) - (1)].intval); ;} +#line 383 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_day += (yyvsp[0].intval); } +#line 1736 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 43: -#line 386 "getdate.y" - { PC.rel_hour += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 385 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_hour += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1742 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 44: -#line 388 "getdate.y" - { PC.rel_hour += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 387 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_hour += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1748 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 45: -#line 390 "getdate.y" - { PC.rel_hour += (yyvsp[(1) - (1)].intval); ;} +#line 389 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_hour += (yyvsp[0].intval); } +#line 1754 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 46: -#line 392 "getdate.y" - { PC.rel_minutes += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 391 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_minutes += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1760 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 47: -#line 394 "getdate.y" - { PC.rel_minutes += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 393 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_minutes += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1766 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 48: -#line 396 "getdate.y" - { PC.rel_minutes += (yyvsp[(1) - (1)].intval); ;} +#line 395 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_minutes += (yyvsp[0].intval); } +#line 1772 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 49: -#line 398 "getdate.y" - { PC.rel_seconds += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 397 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_seconds += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1778 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 50: -#line 400 "getdate.y" - { PC.rel_seconds += (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); ;} +#line 399 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_seconds += (yyvsp[-1].textintval).value * (yyvsp[0].intval); } +#line 1784 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 51: -#line 402 "getdate.y" - { PC.rel_seconds += (yyvsp[(1) - (1)].intval); ;} +#line 401 "source3/modules/getdate.y" /* yacc.c:1646 */ + { pc->rel_seconds += (yyvsp[0].intval); } +#line 1790 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 52: -#line 407 "getdate.y" +#line 406 "source3/modules/getdate.y" /* yacc.c:1646 */ { - if (PC.dates_seen - && ! PC.rels_seen && (PC.times_seen || 2 < (yyvsp[(1) - (1)].textintval).digits)) - PC.year = (yyvsp[(1) - (1)].textintval); + if (pc->dates_seen + && ! pc->rels_seen && (pc->times_seen || 2 < (yyvsp[0].textintval).digits)) + pc->year = (yyvsp[0].textintval); else { - if (4 < (yyvsp[(1) - (1)].textintval).digits) + if (4 < (yyvsp[0].textintval).digits) { - PC.dates_seen++; - PC.day = (yyvsp[(1) - (1)].textintval).value % 100; - PC.month = ((yyvsp[(1) - (1)].textintval).value / 100) % 100; - PC.year.value = (yyvsp[(1) - (1)].textintval).value / 10000; - PC.year.digits = (yyvsp[(1) - (1)].textintval).digits - 4; + pc->dates_seen++; + pc->day = (yyvsp[0].textintval).value % 100; + pc->month = ((yyvsp[0].textintval).value / 100) % 100; + pc->year.value = (yyvsp[0].textintval).value / 10000; + pc->year.digits = (yyvsp[0].textintval).digits - 4; } else { - PC.times_seen++; - if ((yyvsp[(1) - (1)].textintval).digits <= 2) + pc->times_seen++; + if ((yyvsp[0].textintval).digits <= 2) { - PC.hour = (yyvsp[(1) - (1)].textintval).value; - PC.minutes = 0; + pc->hour = (yyvsp[0].textintval).value; + pc->minutes = 0; } else { - PC.hour = (yyvsp[(1) - (1)].textintval).value / 100; - PC.minutes = (yyvsp[(1) - (1)].textintval).value % 100; + pc->hour = (yyvsp[0].textintval).value / 100; + pc->minutes = (yyvsp[0].textintval).value % 100; } - PC.seconds = 0; - PC.meridian = MER24; + pc->seconds = 0; + pc->meridian = MER24; } } - ;} + } +#line 1827 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 53: -#line 443 "getdate.y" - { (yyval.intval) = MER24; ;} +#line 442 "source3/modules/getdate.y" /* yacc.c:1646 */ + { (yyval.intval) = MER24; } +#line 1833 "source3/modules/getdate.c" /* yacc.c:1646 */ break; case 54: -#line 445 "getdate.y" - { (yyval.intval) = (yyvsp[(1) - (1)].intval); ;} +#line 444 "source3/modules/getdate.y" /* yacc.c:1646 */ + { (yyval.intval) = (yyvsp[0].intval); } +#line 1839 "source3/modules/getdate.c" /* yacc.c:1646 */ break; -/* Line 1267 of yacc.c. */ -#line 1935 "getdate.c" +#line 1843 "source3/modules/getdate.c" /* yacc.c:1646 */ default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -1943,8 +1861,7 @@ int yynerrs; *++yyvsp = yyval; - - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -1959,48 +1876,51 @@ int yynerrs; goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; #if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); + yyerror (pc, YY_("syntax error")); #else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (pc, yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; } +# undef YYSYNTAX_ERROR #endif } @@ -2008,24 +1928,24 @@ int yynerrs; if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval, pc); + yychar = YYEMPTY; + } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -2041,7 +1961,7 @@ int yynerrs; if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -2054,38 +1974,37 @@ int yynerrs; | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + if (!yypact_value_is_default (yyn)) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + yystos[yystate], yyvsp, pc); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -2109,28 +2028,33 @@ int yynerrs; yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: - yyerror (YY_("memory exhausted")); + yyerror (pc, YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered + if (yychar != YYEMPTY) + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, pc); + } + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + yystos[*yyssp], yyvsp, pc); YYPOPSTACK (1); } #ifndef yyoverflow @@ -2141,12 +2065,9 @@ int yynerrs; if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - -#line 448 "getdate.y" +#line 447 "source3/modules/getdate.y" /* yacc.c:1906 */ /* Include this file down here because bison inserts code above which @@ -2376,7 +2297,7 @@ to_year (textint textyear) } static table const * -lookup_zone (parser_control const *pc, char const *name) +lookup_zone (struct parser_control const *pc, char const *name) { table const *tp; @@ -2420,7 +2341,7 @@ tm_diff (struct tm const *a, struct tm const *b) #endif /* ! HAVE_TM_GMTOFF */ static table const * -lookup_word (parser_control const *pc, char *word) +lookup_word (struct parser_control const *pc, char *word) { char *p; char *q; @@ -2489,7 +2410,7 @@ lookup_word (parser_control const *pc, char *word) } static int -yylex (YYSTYPE *lvalp, parser_control *pc) +yylex (YYSTYPE *lvalp, struct parser_control *pc) { unsigned char c; size_t count; @@ -2531,18 +2452,18 @@ yylex (YYSTYPE *lvalp, parser_control *pc) if (ISALPHA (c)) { char buff[20]; - char *p = buff; + size_t i = 0; table const *tp; do { - if (p < buff + sizeof buff - 1) - *p++ = c; + if (i < 20) + buff[i++] = c; c = *++pc->input; } while (ISALPHA (c) || c == '.'); - *p = '\0'; + buff[i] = '\0'; tp = lookup_word (pc, buff); if (! tp) return '?'; @@ -2569,7 +2490,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) /* Do nothing if the parser reports an error. */ static int -yyerror (const char *s ATTRIBUTE_UNUSED) +yyerror (struct parser_control *pc ATTRIBUTE_UNUSED, const char *s ATTRIBUTE_UNUSED) { return 0; } @@ -2585,7 +2506,7 @@ get_date (const char *p, const time_t *now) struct tm *tmp = localtime (&Start); struct tm tm; struct tm tm0; - parser_control pc; + struct parser_control pc; if (! tmp) return -1; @@ -2819,4 +2740,3 @@ main (int ac, char **av) return 0; } #endif /* defined TEST */ - From e7a42382987c3caef4d8aa35ebacf789ef79428b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 23 Mar 2018 10:14:50 +0100 Subject: [PATCH 41/64] wafsamba: Add missing cflags_end argument to SAMBA_MODULE Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- buildtools/wafsamba/wafsamba.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 1e331e5fcb3..1f567939505 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -458,6 +458,7 @@ def SAMBA_MODULE(bld, modname, source, autoproto=None, autoproto_extra_source='', cflags='', + cflags_end=None, internal_module=True, local_include=True, global_include=True, @@ -488,6 +489,7 @@ def SAMBA_MODULE(bld, modname, source, autoproto=autoproto, autoproto_extra_source=autoproto_extra_source, cflags=cflags, + cflags_end=cflags_end, local_include=local_include, global_include=global_include, allow_warnings=allow_warnings, @@ -527,6 +529,7 @@ def SAMBA_MODULE(bld, modname, source, deps=deps, includes=includes, cflags=cflags, + cflags_end=cflags_end, realname = realname, autoproto = autoproto, local_include=local_include, From 35a6d3a48ce0a3f9475dab2a45d57b22b2921f0b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 23 Mar 2018 16:27:00 +0100 Subject: [PATCH 42/64] replace: Check for -Wno-strict-overflow Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- lib/replace/wscript | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/replace/wscript b/lib/replace/wscript index 66398970da3..541573babf2 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -122,6 +122,9 @@ def configure(conf): if conf.CHECK_CFLAGS('-Wno-unused-function'): conf.define('HAVE_WNO_UNUSED_FUNCTION', '1') + if conf.CHECK_CFLAGS('-Wno-strict-overflow'): + conf.define('HAVE_WNO_STRICT_OVERFLOW', '1') + # Check for process set name support conf.CHECK_CODE(''' #include From b7a9f1e264df6e419b3c869a2519029c0b06fafe Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 23 Mar 2018 10:18:17 +0100 Subject: [PATCH 43/64] s3:modules: Set -Wno-strict-overflow for getdate if supported bison generates an C89 files which does some weired things. Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source3/modules/wscript_build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index 5c529890470..027283bff87 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -117,10 +117,15 @@ bld.SAMBA3_MODULE('vfs_default_quota', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default_quota')) +module_cflags='' +if bld.CONFIG_SET('HAVE_WNO_STRICT_OVERFLOW'): + module_cflags='-Wno-strict-overflow' + bld.SAMBA3_MODULE('vfs_readonly', subsystem='vfs', source='vfs_readonly.c getdate.c', deps='samba-util', + cflags_end=module_cflags, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readonly')) From 7f8516fa68860bf1a1b68bd5a13ef23c096067b8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 23 Mar 2018 10:52:54 +0100 Subject: [PATCH 44/64] wafsamba: Add missing cflags_end argument to SAMBA_BINARY Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Apr 3 23:08:33 CEST 2018 on sn-devel-144 --- buildtools/wafsamba/wafsamba.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 1f567939505..12d5421c4a6 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -353,6 +353,7 @@ def SAMBA_BINARY(bld, binname, source, modules=None, ldflags=None, cflags='', + cflags_end=None, autoproto=None, use_hostcc=False, use_global_deps=True, @@ -410,6 +411,7 @@ def SAMBA_BINARY(bld, binname, source, deps = deps, includes = includes, cflags = pie_cflags, + cflags_end = cflags_end, group = subsystem_group, autoproto = autoproto, subsystem_name = subsystem_name, From 88e2e2863f12db10f954eb050fbe35d803612379 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 12:32:26 -0500 Subject: [PATCH 45/64] libhttp: Fix CID 1273001 Dereference after null check Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source4/lib/http/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source4/lib/http/http.c b/source4/lib/http/http.c index 10b49cd14fe..9218c19ce31 100644 --- a/source4/lib/http/http.c +++ b/source4/lib/http/http.c @@ -471,6 +471,7 @@ static int http_read_response_next_vector(struct tstream_context *stream, /* Sanity checks */ if (!stream || !private_data || !_vector || !_count) { DEBUG(0, ("%s: Invalid Parameter\n", __func__)); + return -1; } state = talloc_get_type_abort(private_data, struct http_read_response_state); From 06cbd644606795ec6f9e328725e77c4652b2d11b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 13:10:14 -0500 Subject: [PATCH 46/64] libcli: Fix CID 710748 Resource leak Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- libcli/smb/smbXcli_base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index fbf24416093..ad1b67b8476 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -2105,10 +2105,10 @@ static NTSTATUS smb1cli_inbuf_parse_chain(uint8_t *buf, TALLOC_CTX *mem_ctx, wct_ofs = SVAL(cur[0].iov_base, 2); if (wct_ofs < taken) { - return NT_STATUS_INVALID_NETWORK_RESPONSE; + goto inval; } if (wct_ofs > buflen) { - return NT_STATUS_INVALID_NETWORK_RESPONSE; + goto inval; } /* From 2b26f55b9dd13b37717e0d8f52f9c9b66a7b782e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 13:23:01 -0500 Subject: [PATCH 47/64] lsasrv: Fix CID 241331 Self assignment Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source4/rpc_server/lsa/dcesrv_lsa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 17c07d65efe..3a413a5efc4 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -2563,7 +2563,6 @@ static NTSTATUS dcesrv_lsa_EnumTrustDom(struct dcesrv_call_state *dce_call, TALL 1+(r->in.max_size/LSA_ENUM_TRUST_DOMAIN_MULTIPLIER)); r->out.domains->domains = entries + *r->in.resume_handle; - r->out.domains->count = r->out.domains->count; if (r->out.domains->count < count - *r->in.resume_handle) { *r->out.resume_handle = *r->in.resume_handle + r->out.domains->count; From 6291d417698c91911f6a9421b7608f0433e1d4cd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 13:23:43 -0500 Subject: [PATCH 48/64] lsasrv: Fix CID 241332 Self assignment Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source4/rpc_server/lsa/dcesrv_lsa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 3a413a5efc4..9371beec297 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -2657,7 +2657,6 @@ static NTSTATUS dcesrv_lsa_EnumTrustedDomainsEx(struct dcesrv_call_state *dce_ca 1+(r->in.max_size/LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER)); r->out.domains->domains = entries + *r->in.resume_handle; - r->out.domains->count = r->out.domains->count; if (r->out.domains->count < count - *r->in.resume_handle) { *r->out.resume_handle = *r->in.resume_handle + r->out.domains->count; From 6f6563ee734337abb548f95808f77da1c5829351 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 11:37:49 -0500 Subject: [PATCH 49/64] smbd: Fix CID 240676 Dereference after null check Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source3/smbd/open.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 643e074f399..3c24d76a089 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -5079,6 +5079,13 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, if (lease != NULL) { uint16_t epoch = lease->lease_epoch; uint16_t version = lease->lease_version; + + if (req == NULL) { + DBG_WARNING("Got lease on internal open\n"); + status = NT_STATUS_INTERNAL_ERROR; + goto fail; + } + status = lease_match(conn, req, &lease->lease_key, From 2e597753b8e7a3e146c06d0bd85bc5fbd19ded8d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 12:08:42 -0500 Subject: [PATCH 50/64] cldap: Avoid a ZERO_STRUCTP This is done implicitly by tevent_req_create Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- libcli/cldap/cldap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c index 87f82b9b0de..242a1173017 100644 --- a/libcli/cldap/cldap.c +++ b/libcli/cldap/cldap.c @@ -577,7 +577,6 @@ struct tevent_req *cldap_search_send(TALLOC_CTX *mem_ctx, if (!req) { return NULL; } - ZERO_STRUCTP(state); state->caller.ev = ev; state->req = req; state->caller.cldap = cldap; From cfc1e3682f8b7f3023d3635ed50b2b14b3e4e625 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 12:13:03 -0500 Subject: [PATCH 51/64] dsdb: Fix CID 1034744 Dereference after null check This HIGHLY looks like a cut&paste error... Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source4/dsdb/schema/schema_syntax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 6205373a3fc..b434b6b0a5f 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -662,7 +662,7 @@ static WERROR dsdb_syntax_NTTIME_UTC_validate_ldb(const struct dsdb_syntax_ctx * } if (attr->rangeUpper) { - if ((int32_t)t > (int32_t)*attr->rangeLower) { + if ((int32_t)t > (int32_t)*attr->rangeUpper) { return WERR_DS_INVALID_ATTRIBUTE_SYNTAX; } } From e0bbd6a4f7c4d87c2cf24125313304f9587fba5f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 12:19:24 -0500 Subject: [PATCH 52/64] groupdb: Fix CID 1167984 Ignoring number of bytes read Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source3/groupdb/mapping.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index ac70fe68c48..1a8670e66b0 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -237,9 +237,13 @@ int smb_create_group(const char *unix_group, gid_t *new_gid) if (fd != 0) { fstring output; + ssize_t nread; *new_gid = 0; - if (read(fd, output, sizeof(output)) > 0) { + + nread = read(fd, output, sizeof(output)-1); + if (nread > 0) { + output[nread] = '\0'; *new_gid = (gid_t)strtoul(output, NULL, 10); } From d363a4e428768f0ca0678d11ad3ad865f2407724 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 28 Mar 2018 15:23:16 -0500 Subject: [PATCH 53/64] libads: Fix CID 1272809 Free of address-of expression Look at the other SAFE_FREE's in this function... Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- lib/krb5_wrap/krb5_samba.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 7c461e5c286..1493d812266 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -1087,7 +1087,7 @@ krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr addrs->val = (krb5_address *)SMB_MALLOC(sizeof(krb5_address)); if (addrs->val == NULL) { SAFE_FREE(addrs); - SAFE_FREE(kerb_addr); + SAFE_FREE(*kerb_addr); return ENOMEM; } From bbc3b1e33e9faa0f9f9c5e68500dfbebb6812ee8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 28 Mar 2018 15:43:53 -0500 Subject: [PATCH 54/64] dsdb: Fix CID 1034966 Uninitialized scalar variable "continue" in a do-while loop jumps to the "while"-check, so "id_exists" needs to be initialized by that point. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13367 Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source4/dsdb/samdb/ldb_modules/samldb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 108235a91b4..a46fd3735c8 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -875,6 +875,7 @@ static int samldb_add_handle_msDS_IntId(struct samldb_ctx *ac) * order to be sure. */ if (dsdb_attribute_by_attributeID_id(schema, msds_intid)) { + id_exists = true; msds_intid = generate_random() % 0X3FFFFFFF; msds_intid += 0x80000000; continue; From 564d1ac8389c5be28f09b6c648940de2317ea7df Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 28 Mar 2018 15:46:34 -0500 Subject: [PATCH 55/64] utils: Fix CID 1035541 Uninitialized scalar variable Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source3/utils/log2pcaphex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c index 5310982bed3..b5c234f1b3c 100644 --- a/source3/utils/log2pcaphex.c +++ b/source3/utils/log2pcaphex.c @@ -303,7 +303,7 @@ int main(int argc, const char **argv) poptContext pc; char buffer[4096]; long data_offset = 0; - long data_length; + long data_length = 0; long data_bytes_read = 0; size_t in_packet = 0; struct poptOption long_options[] = { From 4b487c756c19b13cb53a24ffab8d970529a48edc Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 28 Mar 2018 15:49:30 -0500 Subject: [PATCH 56/64] pygpo: Fix CID 1422263 Resource leak Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- libgpo/pygpo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c index ac6e3237a82..db336021125 100644 --- a/libgpo/pygpo.c +++ b/libgpo/pygpo.c @@ -264,12 +264,12 @@ static PyObject* py_ads_connect(ADS *self) Py_RETURN_FALSE; } self->ads_ptr->auth.password = smb_xstrdup(passwd); + SAFE_FREE(passwd); self->ads_ptr->auth.realm = smb_xstrdup(self->ads_ptr->server.realm); if (!strupper_m(self->ads_ptr->auth.realm)) { PyErr_SetString(PyExc_SystemError, "Failed to strdup"); TALLOC_FREE(frame); - SAFE_FREE(passwd); Py_RETURN_FALSE; } @@ -278,7 +278,6 @@ static PyObject* py_ads_connect(ADS *self) PyErr_SetString(PyExc_SystemError, "ads_connect() failed"); TALLOC_FREE(frame); - SAFE_FREE(passwd); Py_RETURN_FALSE; } } From b0a348f250deb70ec3f3e78aeca2b8a487acf8dd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 08:27:33 -0500 Subject: [PATCH 57/64] pdb_ldap: Fix CID 1363266 Resource leak Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source3/passdb/pdb_ldap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index bf9377c88d3..39c7a064454 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -6054,7 +6054,7 @@ static NTSTATUS ldapsam_set_primary_group(struct pdb_methods *my_methods, char *filter; char *escape_username; char *gidstr; - const char *dn = NULL; + char *dn = NULL; gid_t gid; int rc; @@ -6125,11 +6125,12 @@ static NTSTATUS ldapsam_set_primary_group(struct pdb_methods *my_methods, smbldap_make_mod(priv2ld(ldap_state), entry, &mods, "gidNumber", gidstr); if (mods == NULL) { + TALLOC_FREE(dn); return NT_STATUS_OK; } rc = smbldap_modify(ldap_state->smbldap_state, dn, mods); - + TALLOC_FREE(dn); if (rc != LDAP_SUCCESS) { DEBUG(0,("ldapsam_set_primary_group: failed to modify [%s] primary group to [%s]\n", pdb_get_username(sampass), gidstr)); From 210d9e320c22f5fadb0d34764262597e2eb695df Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 09:15:30 -0500 Subject: [PATCH 58/64] net: Fix CID 1414752 Resource leak Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source3/utils/net_cache.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source3/utils/net_cache.c b/source3/utils/net_cache.c index 8f9f69f8659..98c5803c428 100644 --- a/source3/utils/net_cache.c +++ b/source3/utils/net_cache.c @@ -456,6 +456,7 @@ static int net_cache_samlogon_show(struct net_context *c, &num_user_sids, true); if (!NT_STATUS_IS_OK(status)) { + TALLOC_FREE(user_sids); d_printf("sid_array_from_info3 failed for %s\n", sid_str); return -1; } @@ -465,6 +466,8 @@ static int net_cache_samlogon_show(struct net_context *c, i, sid_string_dbg(&user_sids[i])); } + TALLOC_FREE(user_sids); + return 0; } From a4f8b8e2de654cdb9506e4b796a84b03f398edcd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 09:16:47 -0500 Subject: [PATCH 59/64] net: Avoid tallocs Not really performance critical, but I think it's worth establishing sample code to use more stack variables than going out to talloc. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- source3/utils/net_cache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/utils/net_cache.c b/source3/utils/net_cache.c index 98c5803c428..f9d12ef4945 100644 --- a/source3/utils/net_cache.c +++ b/source3/utils/net_cache.c @@ -462,8 +462,9 @@ static int net_cache_samlogon_show(struct net_context *c, } for (i = 0; i < num_user_sids; i++) { - d_printf("SID %2" PRIu32 ": %s\n", - i, sid_string_dbg(&user_sids[i])); + char buf[DOM_SID_STR_BUFLEN]; + dom_sid_string_buf(&user_sids[i], buf, sizeof(buf)); + d_printf("SID %2" PRIu32 ": %s\n", i, buf); } TALLOC_FREE(user_sids); From d6a3d33affc7ddea6bb2a9f6e8e0fc5384bcb0fd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 09:23:07 -0500 Subject: [PATCH 60/64] krb5_wrap: Fix CID 1034833 Resource leak Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- lib/krb5_wrap/keytab_util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/krb5_wrap/keytab_util.c b/lib/krb5_wrap/keytab_util.c index f9a8679290c..fd8308cedfe 100644 --- a/lib/krb5_wrap/keytab_util.c +++ b/lib/krb5_wrap/keytab_util.c @@ -179,12 +179,14 @@ krb5_error_code kt_copy_one_principal(krb5_context context, ret = krb5_kt_resolve (context, from, &src_keytab); if (ret) { + krb5_free_principal(context, princ); krb5_set_error_message(context, ret, "resolving src keytab `%s'", from); return ret; } ret = krb5_kt_resolve (context, to, &dst_keytab); if (ret) { + krb5_free_principal(context, princ); krb5_kt_close (context, src_keytab); krb5_set_error_message(context, ret, "resolving dst keytab `%s'", to); return ret; @@ -223,6 +225,7 @@ krb5_error_code kt_copy_one_principal(krb5_context context, } } + krb5_free_principal(context, princ); krb5_kt_close (context, src_keytab); krb5_kt_close (context, dst_keytab); return ret; From 4ce1c6e90dc2ef4fa6af2832575203962095a69a Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 30 Mar 2018 11:08:05 -0500 Subject: [PATCH 61/64] krb5_wrap: Fix CID 1414755 Resource leak Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Stefan Metzmacher Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Wed Apr 4 03:51:00 CEST 2018 on sn-devel-144 --- lib/krb5_wrap/keytab_util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/krb5_wrap/keytab_util.c b/lib/krb5_wrap/keytab_util.c index fd8308cedfe..5fe9216470a 100644 --- a/lib/krb5_wrap/keytab_util.c +++ b/lib/krb5_wrap/keytab_util.c @@ -66,6 +66,7 @@ static krb5_error_code copy_one_entry(krb5_context context, KRB5_KEY_TYPE(KRB5_KT_KEY(&entry)), &etype_str); if(ret) { + krb5_free_unparsed_name(context, name_str); krb5_set_error_message(context, ret, "krb5_enctype_to_string"); etype_str = NULL; /* XXX */ return ret; From a440d10a1b249fe1996557553360d45d5a1f34c3 Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Tue, 13 Mar 2018 08:57:40 +0100 Subject: [PATCH 62/64] ctdb: Remove double sanity checks from ctdb_daemon_read_cb Within ctdb_daemon_read_cb the provided data is checked for sanity, e.g. correct size and content. This is not required because it was done already by the caller (queue_process). Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison --- ctdb/server/ctdb_daemon.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 6d2f70f99b6..3b06972d030 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -895,11 +895,6 @@ static void ctdb_daemon_read_cb(uint8_t *data, size_t cnt, void *args) return; } hdr = (struct ctdb_req_header *)data; - if (cnt != hdr->length) { - ctdb_set_error(client->ctdb, "Bad header length %u expected %u\n in daemon", - (unsigned)hdr->length, (unsigned)cnt); - return; - } if (hdr->ctdb_magic != CTDB_MAGIC) { ctdb_set_error(client->ctdb, "Non CTDB packet rejected\n"); From b3755478004ffd6fc9753870e5dd7d4c75f7535d Mon Sep 17 00:00:00 2001 From: Swen Schillig Date: Tue, 13 Mar 2018 09:22:45 +0100 Subject: [PATCH 63/64] ctdb: Remove double sanity checks from ctdb_tcp_read_cb Within ctdb_tcp_read_cb the provided data is checked for sanity, e.g. correct size and content. This is not required because it was done already by the caller(queue_process). Signed-off-by: Swen Schillig Reviewed-by: Martin Schwenke Reviewed-by: Jeremy Allison Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Wed Apr 4 09:31:04 CEST 2018 on sn-devel-144 --- ctdb/tcp/tcp_io.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ctdb/tcp/tcp_io.c b/ctdb/tcp/tcp_io.c index 3c3b1c167f3..0eb8e25eea3 100644 --- a/ctdb/tcp/tcp_io.c +++ b/ctdb/tcp/tcp_io.c @@ -56,13 +56,6 @@ void ctdb_tcp_read_cb(uint8_t *data, size_t cnt, void *args) goto failed; } - - if (cnt != hdr->length) { - DEBUG(DEBUG_ALERT,(__location__ " Bad header length %u expected %u\n", - (unsigned)hdr->length, (unsigned)cnt)); - goto failed; - } - if (hdr->ctdb_magic != CTDB_MAGIC) { DEBUG(DEBUG_ALERT,(__location__ " Non CTDB packet 0x%x rejected\n", hdr->ctdb_magic)); From 38f402ee2758058d6a4e12d5615c75e00aa850c6 Mon Sep 17 00:00:00 2001 From: Puran Chand Date: Thu, 5 Apr 2018 10:11:52 +0530 Subject: [PATCH 64/64] test fail fix --- selftest/knownfail | 2 ++ 1 file changed, 2 insertions(+) diff --git a/selftest/knownfail b/selftest/knownfail index a2aeed2690d..33426ceb312 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -16,6 +16,7 @@ ^samba3.*rap.sam.*.userdelete # Not provided by Samba 3 ^samba3.libsmbclient.opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered # see bug 8412 +^samba3.libsmbclient.readdirplus # This depends on libsmbclient.opendir ^samba3.smb2.rename.*.simple_nodelete ^samba3.smb2.rename.*.no_share_delete_no_delete_access ^samba3.blackbox.smbclient_machine_auth.plain \(nt4_dc:local\)# the NT4 DC does not currently set up a self-join @@ -125,6 +126,7 @@ ^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items #^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.* ^samba4.libsmbclient.opendir.opendir # This requires netbios browsing +^samba4.libsmbclient.readdirplus.readdirplus # This depends on above test ^samba4.rpc.drsuapi.*.drsuapi.DsGetDomainControllerInfo\(.*\)$ ^samba4.smb2.oplock.exclusive2\(.*\)$ # samba 4 oplocks are a mess ^samba4.smb2.oplock.exclusive5\(.*\)$ # samba 4 oplocks are a mess