The branch, master has been updated
via 5a0ee95 s3: Fix some nonempty blank lines and some typos
from 698d339 selftest: remove make oldtest.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5a0ee95b95d22f8eee7cc86d350fb0e60ab54b69
Author: Volker Lendecke <[email protected]>
Date: Tue Feb 8 23:08:21 2011 +0100
s3: Fix some nonempty blank lines and some typos
Autobuild-User: Volker Lendecke <[email protected]>
Autobuild-Date: Wed Feb 9 00:01:45 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/include/packet.h | 6 +++---
source3/lib/packet.c | 6 +++---
source3/lib/util_sock.c | 2 +-
source3/rpc_server/srv_spoolss_util.c | 2 +-
source3/utils/smbfilter.c | 14 +++++++-------
source3/winbindd/winbindd_samr.c | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/packet.h b/source3/include/packet.h
index 45a9bc2..a77a1a7 100644
--- a/source3/include/packet.h
+++ b/source3/include/packet.h
@@ -2,17 +2,17 @@
Unix SMB/CIFS implementation.
Packet handling
Copyright (C) Volker Lendecke 2007
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/source3/lib/packet.c b/source3/lib/packet.c
index fefb74a..1abf35c 100644
--- a/source3/lib/packet.c
+++ b/source3/lib/packet.c
@@ -2,17 +2,17 @@
Unix SMB/CIFS implementation.
Packet handling
Copyright (C) Volker Lendecke 2007
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 8b25e01..d0ff960 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -111,7 +111,7 @@ char *print_canonical_sockaddr(TALLOC_CTX *ctx,
} else {
dest = talloc_asprintf(ctx, "%s", addr);
}
-
+
return dest;
}
diff --git a/source3/rpc_server/srv_spoolss_util.c
b/source3/rpc_server/srv_spoolss_util.c
index dc861f8..db57574 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -208,7 +208,7 @@ static uint32_t winreg_printer_rev_changeid(void)
#else
/*
* This setting seems to work well but is too untested
- * to replace the above calculation. Left in for experiementation
+ * to replace the above calculation. Left in for experimentation
* of the reader --jerry (Tue Mar 12 09:15:05 CST 2002)
*/
return tv.tv_sec * 10 + tv.tv_usec / 100000;
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 136047a..3e683b9 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -2,17 +2,17 @@
Unix SMB/CIFS implementation.
SMB filter/socket plugin
Copyright (C) Andrew Tridgell 1999
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -193,14 +193,14 @@ static void filter_child(int c, struct sockaddr_storage
*dest_ss)
while (c != -1 || s != -1) {
fd_set fds;
int num;
-
+
FD_ZERO(&fds);
if (s != -1) FD_SET(s, &fds);
if (c != -1) FD_SET(c, &fds);
num = sys_select_intr(MAX(s+1, c+1),&fds,NULL,NULL,NULL);
if (num <= 0) continue;
-
+
if (c != -1 && FD_ISSET(c, &fds)) {
size_t len;
if (!NT_STATUS_IS_OK(receive_smb_raw(
@@ -247,7 +247,7 @@ static void start_filter(char *desthost)
zero_sockaddr(&my_ss);
s = open_socket_in(SOCK_STREAM, 445, 0, &my_ss, True);
-
+
if (s == -1) {
d_printf("bind failed\n");
exit(1);
@@ -267,7 +267,7 @@ static void start_filter(char *desthost)
int num;
struct sockaddr_storage ss;
socklen_t in_addrlen = sizeof(ss);
-
+
FD_ZERO(&fds);
FD_SET(s, &fds);
diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index ef27d38..d33a309 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -141,7 +141,7 @@ static NTSTATUS open_internal_lsa_pipe(TALLOC_CTX *mem_ctx,
}
}
- /* create a samr connection */
+ /* create a lsa connection */
status = rpc_pipe_open_interface(mem_ctx,
&ndr_table_lsarpc.syntax_id,
server_info,
--
Samba Shared Repository
