diff options
author | Volker Lendecke <vl@samba.org> | 2014-09-11 16:46:39 +0200 |
---|---|---|
committer | David Disseldorp <ddiss@samba.org> | 2014-10-07 14:44:04 +0200 |
commit | 0fa16895f12050987c086a9ee27d6cf1b5be7251 (patch) | |
tree | 37399955a1347534a82e5b5b3d7d63a3ec0b1e11 /source3/profile | |
parent | 8cc41b027769b659d1b1503f0fd33ca7d3c3eb9b (diff) | |
download | samba-0fa16895f12050987c086a9ee27d6cf1b5be7251.tar.gz |
smbd: Fix nonempty line endings
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source3/profile')
-rw-r--r-- | source3/profile/profile.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/source3/profile/profile.c b/source3/profile/profile.c index 9367ff45fa9..7aeee8547d7 100644 --- a/source3/profile/profile.c +++ b/source3/profile/profile.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. store smbd profiling information in shared memory Copyright (C) Andrew Tridgell 1999 @@ -8,12 +8,12 @@ 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/>. @@ -102,8 +102,8 @@ static void profile_message(struct messaging_context *msg_ctx, receive a request profile level message ****************************************************************************/ static void reqprofile_message(struct messaging_context *msg_ctx, - void *private_data, - uint32_t msg_type, + void *private_data, + uint32_t msg_type, struct server_id src, DATA_BLOB *data) { @@ -129,33 +129,32 @@ bool profile_setup(struct messaging_context *msg_ctx, bool rdonly) again: /* try to use an existing key */ shm_id = shmget(PROF_SHMEM_KEY, 0, 0); - + /* if that failed then create one. There is a race condition here if we are running from inetd. Bad luck. */ if (shm_id == -1) { if (read_only) return False; - shm_id = shmget(PROF_SHMEM_KEY, sizeof(*profile_h), + shm_id = shmget(PROF_SHMEM_KEY, sizeof(*profile_h), IPC_CREAT | IPC_EXCL | IPC_PERMS); } - + if (shm_id == -1) { - DEBUG(0,("Can't create or use IPC area. Error was %s\n", + DEBUG(0,("Can't create or use IPC area. Error was %s\n", strerror(errno))); return False; - } - - - profile_h = (struct profile_header *)shmat(shm_id, 0, + } + + profile_h = (struct profile_header *)shmat(shm_id, 0, read_only?SHM_RDONLY:0); if ((long)profile_h == -1) { - DEBUG(0,("Can't attach to IPC area. Error was %s\n", + DEBUG(0,("Can't attach to IPC area. Error was %s\n", strerror(errno))); return False; } /* find out who created this memory area */ if (shmctl(shm_id, IPC_STAT, &shm_ds) != 0) { - DEBUG(0,("ERROR shmctl : can't IPC_STAT. Error was %s\n", + DEBUG(0,("ERROR shmctl : can't IPC_STAT. Error was %s\n", strerror(errno))); return False; } |