From: Volker Lendecke Date: Mon, 18 Dec 2023 20:13:56 +0000 (+0100) Subject: libsmb: Fix whitespace and a typo X-Git-Tag: talloc-2.4.2~49 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36303bbdec482b797234155c8e6929a550fb0527;p=thirdparty%2Fsamba.git libsmb: Fix whitespace and a typo Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index af9f215dc75..61e35042586 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. client connect/disconnect routines Copyright (C) Andrew Tridgell 1994-1998 @@ -2776,7 +2776,7 @@ static void cli_start_connection_connected(struct tevent_req *subreq); static void cli_start_connection_done(struct tevent_req *subreq); /** - establishes a connection to after the negprot. + establishes a connection to after the negprot. @param output_cli A fully initialised cli structure, non-null only on success @param dest_host The netbios name of the remote host @param dest_ss (optional) The destination IP, NULL for name based lookup @@ -2938,9 +2938,9 @@ static NTSTATUS cli_start_connection_recv(struct tevent_req *req, return NT_STATUS_OK; } -NTSTATUS cli_start_connection(struct cli_state **output_cli, - const char *my_name, - const char *dest_host, +NTSTATUS cli_start_connection(struct cli_state **output_cli, + const char *my_name, + const char *dest_host, const struct sockaddr_storage *dest_ss, int port, enum smb_signing_setting signing_state, int flags) { @@ -3387,7 +3387,7 @@ NTSTATUS cli_smb1_setup_encryption(struct cli_state *cli, @param dest_ip (optional) The the destination IP, NULL for name based lookup @param port (optional) The destination port (0 for default) @param service (optional) The share to make the connection to. Should be 'unqualified' in any way. - @param service_type The 'type' of serivice. + @param service_type The 'type' of service. @param creds The used user credentials */ diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c index ec0b1efa8ce..a45bdac7771 100644 --- a/source3/libsmb/clidgram.c +++ b/source3/libsmb/clidgram.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. client dgram calls Copyright (C) Andrew Tridgell 1994-1998 diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c index 0a5df8b9ae3..afbec47934b 100644 --- a/source3/libsmb/clierror.c +++ b/source3/libsmb/clierror.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. client error handling routines Copyright (C) Andrew Tridgell 1994-1998 diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 5dc11f69458..cc1b4d40044 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. client file operations Copyright (C) Andrew Tridgell 1994-1998 diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index 3183e2f4f43..cc95f47d4b1 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. FS info functions Copyright (C) Stefan (metze) Metzmacher 2003 diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c index 1f92960639e..0c41272f21a 100644 --- a/source3/libsmb/cliquota.c +++ b/source3/libsmb/cliquota.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. client quota functions Copyright (C) Stefan (metze) Metzmacher 2003 @@ -45,7 +45,7 @@ void free_ntquota_list(SMB_NTQUOTA_LIST **qt_list) (*qt_list) = NULL; - return; + return; } bool add_record_to_ntquota_list(TALLOC_CTX *mem_ctx, diff --git a/source3/libsmb/clisecdesc.c b/source3/libsmb/clisecdesc.c index 0a5708f7ebd..d6a266191ab 100644 --- a/source3/libsmb/clisecdesc.c +++ b/source3/libsmb/clisecdesc.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. client security descriptor functions Copyright (C) Andrew Tridgell 2000 diff --git a/source3/libsmb/conncache.c b/source3/libsmb/conncache.c index d5a865fb112..7310b508a3b 100644 --- a/source3/libsmb/conncache.c +++ b/source3/libsmb/conncache.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. Winbind daemon connection manager diff --git a/source3/libsmb/errormap.c b/source3/libsmb/errormap.c index ba8bc659bab..fd7d6a19e9a 100644 --- a/source3/libsmb/errormap.c +++ b/source3/libsmb/errormap.c @@ -1,20 +1,20 @@ -/* +/* * Unix SMB/CIFS implementation. * error mapping functions * Copyright (C) Andrew Tridgell 2001 * Copyright (C) Andrew Bartlett 2001 * Copyright (C) Tim Potter 2000 - * + * * 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 . */ @@ -293,4 +293,3 @@ NTSTATUS dos_to_ntstatus(uint8_t eclass, uint32_t ecode) } return NT_STATUS_UNSUCCESSFUL; } - diff --git a/source3/libsmb/errormap_wbc.c b/source3/libsmb/errormap_wbc.c index b7e6ec067e0..ad523d6f26d 100644 --- a/source3/libsmb/errormap_wbc.c +++ b/source3/libsmb/errormap_wbc.c @@ -1,20 +1,20 @@ -/* +/* * Unix SMB/CIFS implementation. * error mapping functions * Copyright (C) Andrew Tridgell 2001 * Copyright (C) Andrew Bartlett 2001 * Copyright (C) Tim Potter 2000 - * + * * 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 . */ @@ -60,4 +60,3 @@ NTSTATUS map_nt_error_from_wbcErr(wbcErr wbc_err) /* Default return */ return NT_STATUS_UNSUCCESSFUL; } - diff --git a/source3/libsmb/libsmb_thread_impl.c b/source3/libsmb/libsmb_thread_impl.c index dce611073ea..8b5d8597b21 100644 --- a/source3/libsmb/libsmb_thread_impl.c +++ b/source3/libsmb/libsmb_thread_impl.c @@ -1,18 +1,18 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Derrell Lipman 2009 - + 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 . */ @@ -99,7 +99,7 @@ smbc_thread_impl( int (*lock_mutex)(void *plock, int lock_type, const char *location), - + /* Thread local storage. */ int (*create_tls)(const char *keyname, void **ppkey, diff --git a/source3/libsmb/libsmb_thread_posix.c b/source3/libsmb/libsmb_thread_posix.c index 8c8299dd7f0..36afc02feb2 100644 --- a/source3/libsmb/libsmb_thread_posix.c +++ b/source3/libsmb/libsmb_thread_posix.c @@ -1,18 +1,18 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Derrell Lipman 2009 - + 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 . */ @@ -50,4 +50,3 @@ smbc_thread_posix(void) { smb_thread_set_functions(&tf); } - diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c index 3ccb063160a..dcb2f9e74a7 100644 --- a/source3/libsmb/libsmb_xattr.c +++ b/source3/libsmb/libsmb_xattr.c @@ -1,10 +1,10 @@ -/* +/* Unix SMB/Netbios implementation. SMB client library implementation Copyright (C) Andrew Tridgell 1998 Copyright (C) Richard Sharpe 2000, 2002 Copyright (C) John Terpstra 2000 - Copyright (C) Tom Jansen (Ninja ISD) 2002 + Copyright (C) Tom Jansen (Ninja ISD) 2002 Copyright (C) Derrell Lipman 2003-2008 Copyright (C) Jeremy Allison 2007, 2008 @@ -1060,9 +1060,9 @@ cacl_get(SMBCCTX *context, if (all || all_nt) { if (determine_size) { p = talloc_asprintf( - ctx, + ctx, ",ACL:" - "%s:%d/%d/0x%08x", + "%s:%d/%d/0x%08x", sidstr, ace->type, ace->flags, @@ -1075,7 +1075,7 @@ cacl_get(SMBCCTX *context, } else { n = snprintf( buf, bufsize, - ",ACL:%s:%d/%d/0x%08x", + ",ACL:%s:%d/%d/0x%08x", sidstr, ace->type, ace->flags, @@ -1087,8 +1087,8 @@ cacl_get(SMBCCTX *context, strcasecmp_m(name+4, sidstr) == 0)) { if (determine_size) { p = talloc_asprintf( - ctx, - "%d/%d/0x%08x", + ctx, + "%d/%d/0x%08x", ace->type, ace->flags, ace->access_mask); @@ -1099,7 +1099,7 @@ cacl_get(SMBCCTX *context, n = strlen(p); } else { n = snprintf(buf, bufsize, - "%d/%d/0x%08x", + "%d/%d/0x%08x", ace->type, ace->flags, ace->access_mask); @@ -1107,7 +1107,7 @@ cacl_get(SMBCCTX *context, } else if (all_nt_acls) { if (determine_size) { p = talloc_asprintf( - ctx, + ctx, "%s%s:%d/%d/0x%08x", i ? "," : "", sidstr, @@ -1848,7 +1848,7 @@ SMBC_setxattr_ctx(SMBCCTX *context, dad->mode); if (!ok) { /* cause failure if NT failed too */ - dad = NULL; + dad = NULL; } } @@ -2171,7 +2171,7 @@ SMBC_getxattr_ctx(SMBCCTX *context, /* Yup. */ const char *filename = name; ret = cacl_get(context, talloc_tos(), srv, - ipc_srv == NULL ? NULL : ipc_srv->cli, + ipc_srv == NULL ? NULL : ipc_srv->cli, &ipc_srv->pol, path, filename, discard_const_p(char, value), diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c index f2598ed223f..06e2c5088e0 100644 --- a/source3/libsmb/namequery_dc.c +++ b/source3/libsmb/namequery_dc.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. Winbind daemon connection manager diff --git a/source3/libsmb/smberr.c b/source3/libsmb/smberr.c index 854f9bbdf50..167c796217a 100644 --- a/source3/libsmb/smberr.c +++ b/source3/libsmb/smberr.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. Copyright (C) Andrew Tridgell 1998 @@ -142,7 +142,7 @@ static const struct int code; const char *e_class; err_code_struct *err_msgs; -} err_classes[] = { +} err_classes[] = { {0,"SUCCESS",NULL}, {0x01,"ERRDOS",dos_msgs}, {0x02,"ERRSRV",server_msgs},