The branch, master has been updated
via f0a27064869871806343648de3b5a0667118872f (commit)
via 200b0deaef4d399d321741ce76809beb628a5814 (commit)
via 80faa78a912cda4b3298b832e46c22c045ec85f9 (commit)
from 47f7ef8f39ba482a7d6578ab82c9e0670381c4f8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f0a27064869871806343648de3b5a0667118872f
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Fri Oct 10 23:40:50 2008 +0200
Make use of talloc_tos()
commit 200b0deaef4d399d321741ce76809beb628a5814
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Fri Oct 10 17:50:09 2008 +0200
Fix some nonempty blank lines
commit 80faa78a912cda4b3298b832e46c22c045ec85f9
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Fri Oct 10 16:26:34 2008 +0200
Fix a "nexted extern declaration" warning
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/connection.c | 38 +++++++++++++++++++-------------------
source3/smbd/ipc.c | 12 ++++++------
source3/smbd/nttrans.c | 2 +-
3 files changed, 26 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index 8dd5964..fd83f77 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -2,17 +2,17 @@
Unix SMB/CIFS implementation.
connection claim routines
Copyright (C) Andrew Tridgell 1998
-
+
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/>.
*/
@@ -63,7 +63,7 @@ static int count_fn(struct db_record *rec,
void *udp)
{
struct count_stat *cs = (struct count_stat *)udp;
-
+
if (crec->cnum == -1) {
return 0;
}
@@ -159,7 +159,7 @@ bool claim_connection(connection_struct *conn, const char
*name,
}
crec.start = time(NULL);
crec.bcast_msg_flags = msg_flags;
-
+
strlcpy(crec.machine,get_remote_machine_name(),sizeof(crec.machine));
strlcpy(crec.addr,conn?conn->client_address:
client_addr(get_client_fd(),addr,sizeof(addr)),
@@ -232,17 +232,17 @@ static TDB_DATA* make_pipe_rec_key( struct pipe_open_rec
*prec )
{
TDB_DATA *kbuf = NULL;
fstring key_string;
-
+
if ( !prec )
return NULL;
-
+
if ( (kbuf = TALLOC_P(prec, TDB_DATA)) == NULL ) {
return NULL;
}
-
+
snprintf( key_string, sizeof(key_string), "%s/%d/%d",
prec->name, procid_to_pid(&prec->pid), prec->pnum );
-
+
*kbuf = string_term_tdb_data(talloc_strdup(prec, key_string));
if (kbuf->dptr == NULL )
return NULL;
@@ -273,17 +273,17 @@ bool store_pipe_opendb( smb_np_struct *p )
TDB_DATA *key;
TDB_DATA data;
bool ret = False;
-
- if ( (prec = TALLOC_P( NULL, struct pipe_open_rec)) == NULL ) {
+
+ if ( (prec = TALLOC_P( talloc_tos(), struct pipe_open_rec)) == NULL ) {
DEBUG(0,("store_pipe_opendb: talloc failed!\n"));
return False;
}
-
+
fill_pipe_open_rec( prec, p );
if ( (key = make_pipe_rec_key( prec )) == NULL ) {
goto done;
}
-
+
data.dptr = (uint8 *)prec;
data.dsize = sizeof(struct pipe_open_rec);
@@ -293,7 +293,7 @@ bool store_pipe_opendb( smb_np_struct *p )
}
ret = NT_STATUS_IS_OK(dbrec->store(dbrec, data, TDB_REPLACE));
-
+
done:
TALLOC_FREE( prec );
return ret;
@@ -308,24 +308,24 @@ bool delete_pipe_opendb( smb_np_struct *p )
struct pipe_open_rec *prec;
TDB_DATA *key;
bool ret = False;
-
- if ( (prec = TALLOC_P( NULL, struct pipe_open_rec)) == NULL ) {
+
+ if ( (prec = TALLOC_P( talloc_tos(), struct pipe_open_rec)) == NULL ) {
DEBUG(0,("store_pipe_opendb: talloc failed!\n"));
return False;
}
-
+
fill_pipe_open_rec( prec, p );
if ( (key = make_pipe_rec_key( prec )) == NULL ) {
goto done;
}
-
+
if (!(dbrec = connections_fetch_record(prec, *key))) {
DEBUG(0, ("connections_fetch_record failed\n"));
goto done;
}
ret = NT_STATUS_IS_OK(dbrec->delete_rec(dbrec));
-
+
done:
TALLOC_FREE( prec );
return ret;
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 0f2caad..a824ab7 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -5,17 +5,17 @@
SMB Version handling
Copyright (C) John H Terpstra 1995-1998
-
+
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/>.
*/
@@ -162,7 +162,7 @@ void send_trans_reply(connection_struct *conn, const
uint8_t *inbuf,
copy_trans_params_and_data(outbuf, align,
rparam, tot_param_sent, this_lparam,
rdata, tot_data_sent, this_ldata);
-
+
SSVAL(outbuf,smb_vwv3,this_lparam);
SSVAL(outbuf,smb_vwv4,smb_offset(smb_buf(outbuf)+1,outbuf));
SSVAL(outbuf,smb_vwv5,tot_param_sent);
@@ -735,11 +735,11 @@ void reply_transs(struct smb_request *req)
state->received_param += pcnt;
state->received_data += dcnt;
-
+
if ((state->received_data > state->total_data) ||
(state->received_param > state->total_param))
goto bad_param;
-
+
if (pcnt) {
if (pdisp > state->total_param ||
pcnt > state->total_param ||
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 0618558..43492bf 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -22,6 +22,7 @@
extern int max_send;
extern enum protocol_types Protocol;
+extern const struct generic_mapping file_generic_mapping;
static char *nttrans_realloc(char **ptr, size_t size)
{
@@ -713,7 +714,6 @@ static void do_nt_transact_create_pipe(connection_struct
*conn,
static NTSTATUS set_sd(files_struct *fsp, uint8 *data, uint32 sd_len,
uint32 security_info_sent)
{
- extern const struct generic_mapping file_generic_mapping;
SEC_DESC *psd = NULL;
NTSTATUS status;
--
Samba Shared Repository
