svn commit: samba r24653 - in branches/SAMBA_3_2_0/source: include
lib libads libsmb rpc_client smbd
vlendec at samba.org
vlendec at samba.org
Fri Aug 24 15:00:28 GMT 2007
Author: vlendec
Date: 2007-08-24 15:00:26 +0000 (Fri, 24 Aug 2007)
New Revision: 24653
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24653
Log:
Some trivial 3_2->3_2_0 merges
Modified:
branches/SAMBA_3_2_0/source/include/client.h
branches/SAMBA_3_2_0/source/include/ntdomain.h
branches/SAMBA_3_2_0/source/include/rpc_samr.h
branches/SAMBA_3_2_0/source/include/trans2.h
branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c
branches/SAMBA_3_2_0/source/lib/util_sock.c
branches/SAMBA_3_2_0/source/libads/ads_status.c
branches/SAMBA_3_2_0/source/libsmb/clispnego.c
branches/SAMBA_3_2_0/source/libsmb/smb_signing.c
branches/SAMBA_3_2_0/source/rpc_client/cli_pipe.c
branches/SAMBA_3_2_0/source/smbd/lanman.c
branches/SAMBA_3_2_0/source/smbd/msdfs.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/include/client.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/client.h 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/include/client.h 2007-08-24 15:00:26 UTC (rev 24653)
@@ -34,8 +34,7 @@
* These definitions depend on smb.h
*/
-struct print_job_info
-{
+struct print_job_info {
uint16 id;
uint16 priority;
size_t size;
Modified: branches/SAMBA_3_2_0/source/include/ntdomain.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/ntdomain.h 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/include/ntdomain.h 2007-08-24 15:00:26 UTC (rev 24653)
@@ -264,7 +264,7 @@
*/
BOOL bad_handle_fault_state;
-
+
/*
* Set to true when the backend does not support a call.
*/
Modified: branches/SAMBA_3_2_0/source/include/rpc_samr.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/rpc_samr.h 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/include/rpc_samr.h 2007-08-24 15:00:26 UTC (rev 24653)
@@ -288,7 +288,6 @@
UNISTR2 uni_comment;
UNISTR2 uni_munged_dial ; /* munged path name and dial-back tel no */
LOGON_HRS logon_hrs;
-
} SAM_USER_INFO_25;
/* SAM_USER_INFO_26 */
Modified: branches/SAMBA_3_2_0/source/include/trans2.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/trans2.h 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/include/trans2.h 2007-08-24 15:00:26 UTC (rev 24653)
@@ -552,6 +552,21 @@
(NB statfs field flags can come from FILE_SYSTEM_DEVICE_INFO call)
*/
+#define SMB_QUERY_POSIX_WHO_AM_I 0x202 /* QFS Info */
+/* returns:
+ __u32 flags; 0 = Authenticated user 1 = GUEST
+ __u32 mask; which flags bits server understands ie 0x0001
+ __u64 unix_user_id;
+ __u64 unix_user_gid;
+ __u32 number_of_supplementary_gids; may be zero
+ __u32 number_of_sids; may be zero
+ __u32 length_of_sid_array; in bytes - may be zero
+ __u32 pad; reserved - MBZ
+ __u64 gid_array[0]; may be empty
+ __u8 * psid_list may be empty
+*/
+
+
/* ... more as we think of them :-). */
/* SMB POSIX ACL definitions. */
Modified: branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c
===================================================================
--- branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c 2007-08-24 15:00:26 UTC (rev 24653)
@@ -57,8 +57,7 @@
}
result->key.dsize = key.dsize;
- result->key.dptr = (unsigned char *)talloc_memdup(result, key.dptr,
- key.dsize);
+ result->key.dptr = (uint8 *)talloc_memdup(result, key.dptr, key.dsize);
if (result->key.dptr == NULL) {
DEBUG(0, ("talloc failed\n"));
TALLOC_FREE(result);
@@ -92,8 +91,8 @@
}
result->value.dsize = value.dsize;
- result->value.dptr = (unsigned char *)talloc_memdup(result, value.dptr,
- value.dsize);
+ result->value.dptr = (uint8 *)talloc_memdup(result, value.dptr,
+ value.dsize);
if (result->value.dptr == NULL) {
DEBUG(3, ("talloc failed\n"));
TALLOC_FREE(result);
Modified: branches/SAMBA_3_2_0/source/lib/util_sock.c
===================================================================
--- branches/SAMBA_3_2_0/source/lib/util_sock.c 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/lib/util_sock.c 2007-08-24 15:00:26 UTC (rev 24653)
@@ -744,12 +744,13 @@
/* Check the incoming SMB signature. */
if (!srv_check_sign_mac(buffer, True)) {
DEBUG(0, ("receive_smb: SMB Signature verification failed on incoming packet!\n"));
- if (smb_read_error == 0)
+ if (smb_read_error == 0) {
smb_read_error = READ_BAD_SIG;
+ }
return False;
- };
+ }
- return(True);
+ return True;
}
/****************************************************************************
Modified: branches/SAMBA_3_2_0/source/libads/ads_status.c
===================================================================
--- branches/SAMBA_3_2_0/source/libads/ads_status.c 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/libads/ads_status.c 2007-08-24 15:00:26 UTC (rev 24653)
@@ -140,7 +140,5 @@
default:
return "Unknown ADS error type!? (not compiled in?)";
}
-
}
-
Modified: branches/SAMBA_3_2_0/source/libsmb/clispnego.c
===================================================================
--- branches/SAMBA_3_2_0/source/libsmb/clispnego.c 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/libsmb/clispnego.c 2007-08-24 15:00:26 UTC (rev 24653)
@@ -541,7 +541,7 @@
asn1_check_enumerated(&data, negResult);
asn1_end_tag(&data);
- *auth = data_blob(NULL,0);
+ *auth = data_blob_null;
if (asn1_tag_remaining(&data)) {
asn1_start_tag(&data,ASN1_CONTEXT(1));
Modified: branches/SAMBA_3_2_0/source/libsmb/smb_signing.c
===================================================================
--- branches/SAMBA_3_2_0/source/libsmb/smb_signing.c 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/libsmb/smb_signing.c 2007-08-24 15:00:26 UTC (rev 24653)
@@ -815,8 +815,9 @@
BOOL srv_check_sign_mac(const char *inbuf, BOOL must_be_ok)
{
/* Check if it's a session keepalive. */
- if(CVAL(inbuf,0) == SMBkeepalive)
+ if(CVAL(inbuf,0) == SMBkeepalive) {
return True;
+ }
return srv_sign_info.check_incoming_message(inbuf, &srv_sign_info, must_be_ok);
}
@@ -828,9 +829,9 @@
void srv_calculate_sign_mac(char *outbuf)
{
/* Check if it's a session keepalive. */
- /* JRA Paranioa test - do we ever generate these in the server ? */
- if(CVAL(outbuf,0) == SMBkeepalive)
+ if(CVAL(outbuf,0) == SMBkeepalive) {
return;
+ }
srv_sign_info.sign_outgoing_message(outbuf, &srv_sign_info);
}
Modified: branches/SAMBA_3_2_0/source/rpc_client/cli_pipe.c
===================================================================
--- branches/SAMBA_3_2_0/source/rpc_client/cli_pipe.c 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/rpc_client/cli_pipe.c 2007-08-24 15:00:26 UTC (rev 24653)
@@ -1644,10 +1644,10 @@
}
DEBUG(5,("Bind Abstract Syntax: "));
- dump_data(5, (uint8*)&pipe_names[pipe_idx].abstr_syntax,
+ dump_data(5, (uint8 *)&pipe_names[pipe_idx].abstr_syntax,
sizeof(pipe_names[pipe_idx].abstr_syntax));
DEBUG(5,("Bind Transfer Syntax: "));
- dump_data(5, (uint8*)&pipe_names[pipe_idx].trans_syntax,
+ dump_data(5, (uint8 *)&pipe_names[pipe_idx].trans_syntax,
sizeof(pipe_names[pipe_idx].trans_syntax));
/* copy the required syntaxes out so we can do the right bind */
Modified: branches/SAMBA_3_2_0/source/smbd/lanman.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/lanman.c 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/smbd/lanman.c 2007-08-24 15:00:26 UTC (rev 24653)
@@ -4363,8 +4363,8 @@
/****************************************************************************
- Handle remote api calls
- ****************************************************************************/
+ Handle remote api calls.
+****************************************************************************/
int api_reply(connection_struct *conn,uint16 vuid,char *outbuf,char *data,char *params,
int tdscnt,int tpscnt,int mdrcnt,int mprcnt)
Modified: branches/SAMBA_3_2_0/source/smbd/msdfs.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/msdfs.c 2007-08-24 14:36:13 UTC (rev 24652)
+++ branches/SAMBA_3_2_0/source/smbd/msdfs.c 2007-08-24 15:00:26 UTC (rev 24653)
@@ -987,7 +987,7 @@
if (DEBUGLVL(10)) {
DEBUGADD(0,("DFS Referral pdata:\n"));
- dump_data(0,(uint8*)*ppdata,reply_size);
+ dump_data(0,(uint8 *)*ppdata,reply_size);
}
talloc_destroy(ctx);
More information about the samba-cvs
mailing list