svn commit: samba r6506 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2005-04-28 06:36:00 + (Thu, 28 Apr 2005) New Revision: 6506 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6506 Log: Rename parameter to GetDomPwInfo. Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py === --- branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 05:09:30 UTC (rev 6505) +++ branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 06:36:00 UTC (rev 6506) @@ -195,11 +195,11 @@ call_fn(dcerpc.dcerpc_samr_Shutdown, self.pipe, r) -def GetDomPwInfo(self, system_name): +def GetDomPwInfo(self, domain_name): r = dcerpc.samr_GetDomPwInfo() r.data_in.domain_name = dcerpc.samr_String() -r.data_in.domain_name.string = system_name +r.data_in.domain_name.string = domain_name call_fn(dcerpc.dcerpc_samr_GetDomPwInfo, self.pipe, r)
svn commit: samba r6507 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2005-04-28 07:05:48 + (Thu, 28 Apr 2005) New Revision: 6507 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6507 Log: Fix syntax error in GetAliasMembership(). Implement SetDomainInfo() which got lost somehow. Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py === --- branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 06:36:00 UTC (rev 6506) +++ branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 07:05:48 UTC (rev 6507) @@ -228,6 +228,16 @@ return getattr(r.data_out.info, 'info%d' % level) +def SetDomainInfo(self, level, info): + +r = dcerpc.samr_SetDomainInfo() +r.data_in.domain_handle = self.handle +r.data_in.level = level +r.data_in.info = dcerpc.samr_DomainInfo() +setattr(r.data_in.info, 'info%d' % level, info) + +call_fn(dcerpc.dcerpc_samr_SetDomainInfo, self.pipe, r) + def EnumDomainGroups(self): r = dcerpc.samr_EnumDomainGroups() @@ -419,7 +429,7 @@ call_fn(dcerpc.dcerpc_samr_GetAliasMembership, self.pipe, r) -return [r.ids[x] x in range(r.count)] +return [r.ids[x] for x in range(r.count)] class UserHandle(SamrHandle):
svn commit: samba r6508 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2005-04-28 07:22:21 + (Thu, 28 Apr 2005) New Revision: 6508 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6508 Log: Fix typo - yay testsuite. Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py === --- branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 07:05:48 UTC (rev 6507) +++ branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 07:22:21 UTC (rev 6508) @@ -344,7 +344,7 @@ call_fn(dcerpc.dcerpc_samr_OpenGroup, self.pipe, r) -return GroupHandle(pipe, r.data_out.group_handle) +return GroupHandle(self.pipe, r.data_out.group_handle) def OpenAlias(self, rid, access_mask = 0x0200):
svn commit: samba r6509 - in branches/SAMBA_4_0/source/torture/rap: .
Author: tridge Date: 2005-04-28 07:30:36 + (Thu, 28 Apr 2005) New Revision: 6509 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6509 Log: fixed a crash bug found by [EMAIL PROTECTED] in RPC-RAP test (the call freed the memory it used to fill in the result structure) Modified: branches/SAMBA_4_0/source/torture/rap/rap.c Changeset: Modified: branches/SAMBA_4_0/source/torture/rap/rap.c === --- branches/SAMBA_4_0/source/torture/rap/rap.c 2005-04-28 07:22:21 UTC (rev 6508) +++ branches/SAMBA_4_0/source/torture/rap/rap.c 2005-04-28 07:30:36 UTC (rev 6509) @@ -207,6 +207,7 @@ } while (0) static NTSTATUS smbcli_rap_netshareenum(struct smbcli_state *cli, + TALLOC_CTX *mem_ctx, struct rap_NetShareEnum *r) { struct rap_call *call; @@ -241,8 +242,7 @@ NDR_OK(ndr_pull_uint16(call-ndr_pull_param, NDR_SCALARS, r-out.count)); NDR_OK(ndr_pull_uint16(call-ndr_pull_param, NDR_SCALARS, r-out.available)); - r-out.info = talloc_array(call, union rap_shareenum_info, -r-out.count); + r-out.info = talloc_array(mem_ctx, union rap_shareenum_info, r-out.count); if (r-out.info == NULL) { result = NT_STATUS_NO_MEMORY; @@ -262,7 +262,7 @@ (uint8_t *)r-out.info[i].info1.pad, 1)); NDR_OK(ndr_pull_uint16(call-ndr_pull_data, NDR_SCALARS, r-out.info[i].info1.type)); - NDR_OK(rap_pull_string(call, call-ndr_pull_data, + NDR_OK(rap_pull_string(mem_ctx, call-ndr_pull_data, r-out.convert, r-out.info[i].info1.comment)); break; @@ -280,11 +280,12 @@ { struct rap_NetShareEnum r; int i; + TALLOC_CTX *tmp_ctx = talloc_new(cli); r.in.level = 1; r.in.bufsize = 8192; - if (!NT_STATUS_IS_OK(smbcli_rap_netshareenum(cli, r))) + if (!NT_STATUS_IS_OK(smbcli_rap_netshareenum(cli, tmp_ctx, r))) return False; for (i=0; ir.out.count; i++) { @@ -293,10 +294,13 @@ r.out.info[i].info1.comment); } + talloc_free(tmp_ctx); + return True; } static NTSTATUS smbcli_rap_netserverenum2(struct smbcli_state *cli, + TALLOC_CTX *mem_ctx, struct rap_NetServerEnum2 *r) { struct rap_call *call; @@ -335,8 +339,7 @@ NDR_OK(ndr_pull_uint16(call-ndr_pull_param, NDR_SCALARS, r-out.count)); NDR_OK(ndr_pull_uint16(call-ndr_pull_param, NDR_SCALARS, r-out.available)); - r-out.info = talloc_array(call, union rap_server_info, -r-out.count); + r-out.info = talloc_array(mem_ctx, union rap_server_info, r-out.count); if (r-out.info == NULL) { result = NT_STATUS_NO_MEMORY; @@ -358,7 +361,7 @@ r-out.info[i].info1.version_minor, 1)); NDR_OK(ndr_pull_uint32(call-ndr_pull_data, NDR_SCALARS, r-out.info[i].info1.servertype)); - NDR_OK(rap_pull_string(call, call-ndr_pull_data, + NDR_OK(rap_pull_string(mem_ctx, call-ndr_pull_data, r-out.convert, r-out.info[i].info1.comment)); } @@ -375,6 +378,7 @@ { struct rap_NetServerEnum2 r; int i; + TALLOC_CTX *tmp_ctx = talloc_new(cli); r.in.level = 0; r.in.bufsize = 8192; @@ -382,7 +386,7 @@ r.in.servertype = 0x8000; r.in.domain = NULL; - if (!NT_STATUS_IS_OK(smbcli_rap_netserverenum2(cli, r))) + if (!NT_STATUS_IS_OK(smbcli_rap_netserverenum2(cli, tmp_ctx, r))) return False; for (i=0; ir.out.count; i++) { @@ -398,6 +402,8 @@ } } + talloc_free(tmp_ctx); + return True; }
svn commit: samba r6510 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2005-04-28 07:44:49 + (Thu, 28 Apr 2005) New Revision: 6510 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6510 Log: Initialise rid parameter in samr_RidToSid(). This is faulting for me on win2k - not sure why. Add dodgy implementations of QueryDisplayInfo{,2,3}() Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py === --- branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 07:30:36 UTC (rev 6509) +++ branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 07:44:49 UTC (rev 6510) @@ -374,6 +374,7 @@ r = dcerpc.samr_RidToSid() r.data_in.domain_handle = self.handle +r.data_in.rid = rid call_fn(dcerpc.dcerpc_samr_RidToSid, self.pipe, r) @@ -431,6 +432,61 @@ return [r.ids[x] for x in range(r.count)] +def QueryDisplayInfo(self, level): + +# TODO: Handle more data returns + +r = dcerpc.samr_QueryDisplayInfo() +r.data_in.domain_handle = self.handle +r.data_in.level = level +r.data_in.start_idx = 0 +r.data_in.max_entries = 1000 +r.data_in.buf_size = -1 + +call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo, self.pipe, r) + +# TODO: Return a mapping of the various samr_DispInfo +# structures here. + +return getattr(r.data_out.info, 'info%d' % level) + +def QueryDisplayInfo2(self, level): + +# TODO: Handle more data returns + +r = dcerpc.samr_QueryDisplayInfo2() +r.data_in.domain_handle = self.handle +r.data_in.level = level +r.data_in.start_idx = 0 +r.data_in.max_entries = 1000 +r.data_in.buf_size = -1 + +call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo2, self.pipe, r) + +# TODO: Return a mapping of the various samr_DispInfo +# structures here. + +return getattr(r.data_out.info, 'info%d' % level) + +def QueryDisplayInfo3(self, level): + +# TODO: Handle more data returns + +r = dcerpc.samr_QueryDisplayInfo3() +r.data_in.domain_handle = self.handle +r.data_in.level = level +r.data_in.start_idx = 0 +r.data_in.max_entries = 1000 +r.data_in.buf_size = -1 + +call_fn(dcerpc.dcerpc_samr_QueryDisplayInfo3, self.pipe, r) + +# TODO: Return a mapping of the various samr_DispInfo +# structures here. + +return getattr(r.data_out.info, 'info%d' % level) + + class UserHandle(SamrHandle): def DeleteUser(self): @@ -576,17 +632,13 @@ # SetUserInfo # ChangePasswordUser # GetGroupsForUser -# QueryDisplayInfo # GetDisplayEnumerationIndex # TestPrivateFunctionsDomain # TestPrivateFunctionsUser # GetUserPwInfo # RemoveMemberFromForeignDomain -# QueryDomainInfo2 # QueryUserInfo2 -# QueryDisplayInfo2 # GetDisplayEnumerationIndex2 -# QueryDisplayInfo3 # RemoveMultipleMembersFromAlias # OemChangePasswordUser2 # ChangePasswordUser2
svn commit: samba r6511 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2005-04-28 07:51:41 + (Thu, 28 Apr 2005) New Revision: 6511 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6511 Log: Implement GetUserPwInfo(), QueryUserInfo(), QueryUserInfo2(). Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/samr.py === --- branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 07:44:49 UTC (rev 6510) +++ branches/SAMBA_4_0/source/scripting/swig/samr.py2005-04-28 07:51:41 UTC (rev 6511) @@ -497,8 +497,36 @@ call_fn(dcerpc.dcerpc_samr_DeleteUser, self.pipe, r) self.handle = None - +def GetUserPwInfo(self): + +r = dcerpc.samr_GetUserPwInfo() +r.data_in.user_handle = self.handle + +call_fn(dcerpc.dcerpc_samr_GetUserPwInfo, self.pipe, r) + +return r.data_out.info + +def QueryUserInfo(self, level): + +r = dcerpc.samr_QueryUserInfo() +r.data_in.user_handle = self.handle +r.data_in.level = level + +call_fn(dcerpc.dcerpc_samr_QueryUserInfo, self.pipe, r) + +return r.data_out.info + +def QueryUserInfo2(self, level): + +r = dcerpc.samr_QueryUserInfo2() +r.data_in.user_handle = self.handle +r.data_in.level = level + +call_fn(dcerpc.dcerpc_samr_QueryUserInfo2, self.pipe, r) + +return r.data_out.info + class GroupHandle(SamrHandle): pass @@ -603,7 +631,6 @@ return ConnectHandle(pipe, r.data_out.connect_handle) - def Connect5(pipe, system_name = '', access_mask = 0x0200): r = dcerpc.samr_Connect5() @@ -628,16 +655,13 @@ # AddAliasMember # DeleteAliasMember # GetMembersinAlias -# QueryUserInfo # SetUserInfo # ChangePasswordUser # GetGroupsForUser # GetDisplayEnumerationIndex # TestPrivateFunctionsDomain # TestPrivateFunctionsUser -# GetUserPwInfo # RemoveMemberFromForeignDomain -# QueryUserInfo2 # GetDisplayEnumerationIndex2 # RemoveMultipleMembersFromAlias # OemChangePasswordUser2
svn commit: samba r6512 - in branches/SAMBA_4_0/source/scripting/swig/torture: .
Author: tpot Date: 2005-04-28 07:52:32 + (Thu, 28 Apr 2005) New Revision: 6512 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6512 Log: Refactor samr torture test to use the nicer OO interface instead of the previous dictionary based SWIG interface (which was broken anyway). Modified: branches/SAMBA_4_0/source/scripting/swig/torture/torture_samr.py Changeset: Sorry, the patch is too large (733 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6512
svn commit: samba-docs r517 - in trunk/manpages: .
Author: jht Date: 2005-04-28 14:53:39 + (Thu, 28 Apr 2005) New Revision: 517 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=517 Log: Fixing typo. Modified: trunk/manpages/pdbedit.8.xml Changeset: Modified: trunk/manpages/pdbedit.8.xml === --- trunk/manpages/pdbedit.8.xml2005-04-28 04:38:39 UTC (rev 516) +++ trunk/manpages/pdbedit.8.xml2005-04-28 14:53:39 UTC (rev 517) @@ -178,7 +178,7 @@ modifing a user account. It will specify the user's logon script path./para - paraExample: command-s BERSERKER\\netlogon\\sorce.bat/command + paraExample: command-S BERSERKER\\netlogon\\sorce.bat/command /para /listitem /varlistentry
svn commit: samba r6513 - in branches/SAMBA_4_0/source/lib/talloc: .
Author: vlendec Date: 2005-04-28 14:54:17 + (Thu, 28 Apr 2005) New Revision: 6513 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6513 Log: Commit talloc_free_children. Volker Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c branches/SAMBA_4_0/source/lib/talloc/talloc_guide.txt Changeset: Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c === --- branches/SAMBA_4_0/source/lib/talloc/talloc.c 2005-04-28 07:52:32 UTC (rev 6512) +++ branches/SAMBA_4_0/source/lib/talloc/talloc.c 2005-04-28 14:54:17 UTC (rev 6513) @@ -461,7 +461,43 @@ return ptr; } +/* + this is a replacement for the Samba3 talloc_destroy_pool functionality. It + should probably not be used in new code. It's in here to keep the talloc + code consistent across Samba 3 and 4. +*/ +void talloc_free_children(void *ptr) +{ + struct talloc_chunk *tc; + if (ptr == NULL) { + return; + } + + tc = talloc_chunk_from_ptr(ptr); + + while (tc-child) { + /* we need to work out who will own an abandoned child + if it cannot be freed. In priority order, the first + choice is owner of any remaining reference to this + pointer, the second choice is our parent, and the + final choice is the null context. */ + void *child = tc-child+1; + const void *new_parent = null_context; + if (tc-child-refs) { + struct talloc_chunk *p = talloc_parent_chunk(tc-child-refs); + if (p) new_parent = p+1; + } + if (talloc_free(child) == -1) { + if (new_parent == null_context) { + struct talloc_chunk *p = talloc_parent_chunk(ptr); + if (p) new_parent = p+1; + } + talloc_steal(new_parent, child); + } + } +} + /* free a talloc pointer. This also frees all child pointers of this pointer recursively @@ -498,26 +534,7 @@ tc-destructor = NULL; } - while (tc-child) { - /* we need to work out who will own an abandoned child - if it cannot be freed. In priority order, the first - choice is owner of any remaining reference to this - pointer, the second choice is our parent, and the - final choice is the null context. */ - void *child = tc-child+1; - const void *new_parent = null_context; - if (tc-child-refs) { - struct talloc_chunk *p = talloc_parent_chunk(tc-child-refs); - if (p) new_parent = p+1; - } - if (talloc_free(child) == -1) { - if (new_parent == null_context) { - struct talloc_chunk *p = talloc_parent_chunk(ptr); - if (p) new_parent = p+1; - } - talloc_steal(new_parent, child); - } - } + talloc_free_children(ptr); if (tc-parent) { _TLIST_REMOVE(tc-parent-child, tc); Modified: branches/SAMBA_4_0/source/lib/talloc/talloc_guide.txt === --- branches/SAMBA_4_0/source/lib/talloc/talloc_guide.txt 2005-04-28 07:52:32 UTC (rev 6512) +++ branches/SAMBA_4_0/source/lib/talloc/talloc_guide.txt 2005-04-28 14:54:17 UTC (rev 6513) @@ -106,6 +106,14 @@ =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +int talloc_free_children(void *ptr); + +The talloc_free_children() walks along the list of all children of a +talloc context and talloc_free()s only the children, not the context +itself. + + +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- void *talloc_reference(const void *context, const void *ptr); The talloc_reference() function makes context an additional parent
svn commit: samba-web r651 - in trunk/news/announcements: .
Author: deryck Date: 2005-04-28 15:21:49 + (Thu, 28 Apr 2005) New Revision: 651 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=651 Log: Adding news item announcing Linux CIFS client 1.34. deryck Added: trunk/news/announcements/cifs_client_1.34.html Changeset: Added: trunk/news/announcements/cifs_client_1.34.html === --- trunk/news/announcements/cifs_client_1.34.html 2005-04-28 02:17:26 UTC (rev 650) +++ trunk/news/announcements/cifs_client_1.34.html 2005-04-28 15:21:49 UTC (rev 651) @@ -0,0 +1,30 @@ +h3a name=linux_cifs_client_1.34Improved Linux CIFS Client 1.34 Released/a/h3 + +div class=article + pThe 1.34 version of the CIFS client has been released. This version i + includes many improvements:/p + + ul +liNT 4 servers are now better supported./li +liA umount.cifs user mount helper has been added./li +liThe cifs client can now optionally handle some of the reserved +characters (such as colon) in filenames./li +liA key client file caching bug was fixed./li +liStability under stress is much improved./li +liMemory allocations by the client have been significantly reduced in +the receive path, greatly improving (in some cases ten fold) +performance under stress scenarios such as dbench./li + /ul + + pSee the changelog fs/cifs/CHANGES and fs/cifs/README for additional + details./p + + pDownload instructions, including replacement cifs files for a few + common kernels, can be found at the + a href=http://linux-cifs.samba.org/;project page/a./p + + pThis version has been submitted for inclusion in future Linux + mainline kernels. /p +/div + +
svn commit: samba-web r652 - in trunk/news/team: .
Author: deryck Date: 2005-04-28 16:06:26 + (Thu, 28 Apr 2005) New Revision: 652 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=652 Log: Adding news item on Volker's interview with golem.de. deryck Added: trunk/news/team/vl_golem_interview.html Changeset: Added: trunk/news/team/vl_golem_interview.html === --- trunk/news/team/vl_golem_interview.html 2005-04-28 15:21:49 UTC (rev 651) +++ trunk/news/team/vl_golem_interview.html 2005-04-28 16:06:26 UTC (rev 652) @@ -0,0 +1,17 @@ +h3a name=vl_golem_interviewVolker Lendecke Interviewed/a/h3 + +div class=article + pGerman IT news site a href=http://www.golem.de/;golem.de/a is + running an interview with our very own Volker Lendecke. In the + interview Volker discusses Samba4 development. Volker speaks about the + timeline for Samba4 development, its LDAP backend, and Samba's usefulness + in Unix to Unix file sharing./p + + pThe interview is in German and is available + a href=http://www.golem.de/0504/37762.html;here/a. + (Or a href=http://google.com/translate?u=http%3A%2F%2Fwww.golem.de%2F0504%2F37762.htmllangpair=de%7Cenhl=enie=UTF8;here/a, + in English via + a href=http://www.google.com/translate;Google translate/a.)/p +/div + +
svn commit: samba-web r654 - in trunk/news/team: .
Author: deryck Date: 2005-04-28 19:38:29 + (Thu, 28 Apr 2005) New Revision: 654 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=654 Log: What a news day! :-) Adding piece on jra's move to Novell. deryck Added: trunk/news/team/jra_to_novell.html Changeset: Added: trunk/news/team/jra_to_novell.html === --- trunk/news/team/jra_to_novell.html 2005-04-28 18:40:05 UTC (rev 653) +++ trunk/news/team/jra_to_novell.html 2005-04-28 19:38:29 UTC (rev 654) @@ -0,0 +1,18 @@ +h3a name=jra_to_novellJeremy Allison to Novell/a/h3 + +div class=article + pa href=http://news.com.com/;CNET news/a is reporting on Jeremy + Allison's move to Novell. The piece begins:/p + + blockquoteAllison previously worked for Hewlett-Packard. He said he + made the switch because he believes that he can benefit from the + experience Novell programmers have in the area of file servers. These + guys know a lot about file sharing, said Allison, who starts the new + job on Thursday./blockquote + + pBest wishes to Jeremy during the transition! And for the complete + article, see a href=http://news.com.com/Novell+hires+top+Samba+programmer+from+HP/2100-7344-5687627.html?part=dtxtag=ntoptag=nl.e703;Novell hires + top Samba programmer from HP/a./p +/div + +
svn commit: samba-web r655 - in trunk/support: .
Author: deryck Date: 2005-04-28 20:01:16 + (Thu, 28 Apr 2005) New Revision: 655 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=655 Log: Updating support info per Mandrake/Mandrive's request. deryck Modified: trunk/support/france.html Changeset: Modified: trunk/support/france.html === --- trunk/support/france.html 2005-04-28 19:38:29 UTC (rev 654) +++ trunk/support/france.html 2005-04-28 20:01:16 UTC (rev 655) @@ -107,30 +107,30 @@ /small/pre -!-- Added: 22 January 2005 -- +!-- Updated: 28 April 2005 -- hr / presmall -MANDRAKESOFT +Mandriva (formerly Mandrakesoft) 43 rue d'Aboukir 75002 Paris France -Email: a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a +Email: a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/a Tel: 33 1 40 41 00 41 Fax: 33 1 40 41 92 00 -Mandrakesoft has become a significant player in the professional Samba world. +Mandriva (formerly Mandrakesoft) has become a significant player in the professional Samba world. It has recently designed a unique tool for migrating Windows NT 4.0 servers to Linux servers running Samba. Developed for the French Ministry of Agriculture and Ministry of Culture, the migration kit is now being used in a number of very large server deployments -(over thousands). Mandrakesoft's professional services team are experienced +(over thousands). Mandriva's professional services team are experienced in handling mid to large-scale projects. /small/pre hr / presmall -EDGE-IT (Mandrakesoft Group): +EDGE-IT (Mandriva (formerly Mandrakesoft) Group): 43 rue d'Aboukir 75002 Paris France @@ -138,8 +138,8 @@ Tel: 33 1 40 41 17 65 Fax: 33 1 40 41 17 80 -Edge-IT, a Mandrakesoft subsidiary, specializes in providing -professional support to business and public sector customers. +Edge-IT, a Mandriva (formerly Mandrakesoft) subsidiary, specializes in +providing professional support to business and public sector customers. Edge-IT offer several support formulas (annual contract including unlimited calls, incident based contract, seat contract ...)to fit specific environments as well as possible. These formulas are made even more flexible
svn commit: samba r6514 - in branches/SAMBA_3_0/source/client: .
Author: sfrench Date: 2005-04-28 22:28:11 + (Thu, 28 Apr 2005) New Revision: 6514 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6514 Log: Allow domain= to be specified in credentials file. Fix umount.cifs help, allow root to unmount someone else's mount Modified: branches/SAMBA_3_0/source/client/mount.cifs.c branches/SAMBA_3_0/source/client/umount.cifs.c Changeset: Modified: branches/SAMBA_3_0/source/client/mount.cifs.c === --- branches/SAMBA_3_0/source/client/mount.cifs.c 2005-04-28 14:54:17 UTC (rev 6513) +++ branches/SAMBA_3_0/source/client/mount.cifs.c 2005-04-28 22:28:11 UTC (rev 6514) @@ -39,7 +39,7 @@ #include fcntl.h #define MOUNT_CIFS_VERSION_MAJOR 1 -#define MOUNT_CIFS_VERSION_MINOR 7 +#define MOUNT_CIFS_VERSION_MINOR 8 #ifndef MOUNT_CIFS_VENDOR_SUFFIX #define MOUNT_CIFS_VENDOR_SUFFIX @@ -185,13 +185,41 @@ } else memset(mountpassword,0,64); if(mountpassword) { - /* BB add handling for commas in password here */ strncpy(mountpassword,temp_val,length); got_password = 1; } } } - } +} else if (strncasecmp(domain,line_buf+i,6) == 0) { +temp_val = strchr(line_buf+i,'='); +if(temp_val) { +/* go past equals sign */ +temp_val++; + if(verboseflag) + printf(\nDomain %s\n,temp_val); +for(length = 0;length65;length++) { +if(temp_val[length] == '\n') +break; +} +if(length 64) { +printf(mount.cifs failed: domain in credentials file too long\n); +if(mountpassword) { +memset(mountpassword,0,64); +} +exit(1); +} else { +if(domain_name == NULL) { +domain_name = calloc(65,1); +} else +memset(domain_name,0,64); +if(domain_name) { + strncpy(domain_name,temp_val,length); +got_domain = 1; +} +} +} +} + } fclose(fs); if(line_buf) { @@ -888,6 +916,7 @@ break; case 'd': domain_name = optarg; /* BB fix this - currently ignored */ + got_domain = 1; break; case 'p': if(mountpassword == NULL) @@ -1017,7 +1046,8 @@ if(user_name) { /* check for syntax like user=domain\user */ - domain_name = check_for_domain(user_name); + if(got_domain == 0) + domain_name = check_for_domain(user_name); strncat(options,,user=,6); strcat(options,user_name); } Modified: branches/SAMBA_3_0/source/client/umount.cifs.c === --- branches/SAMBA_3_0/source/client/umount.cifs.c 2005-04-28 14:54:17 UTC (rev 6513) +++ branches/SAMBA_3_0/source/client/umount.cifs.c 2005-04-28 22:28:11 UTC (rev 6514) @@ -37,7 +37,7 @@ #include fstab.h #define UNMOUNT_CIFS_VERSION_MAJOR 0 -#define UNMOUNT_CIFS_VERSION_MINOR 3 +#define UNMOUNT_CIFS_VERSION_MINOR 4 #ifndef UNMOUNT_CIFS_VENDOR_SUFFIX #define UNMOUNT_CIFS_VENDOR_SUFFIX @@ -93,6 +93,7 @@ printf(\n\tman 8 umount.cifs\n); printf(\nTo display the version number of the cifs umount utility:); printf(\n\t%s -V\n,thisprogram); + printf(\nNote that invoking the umount utility on cifs mounts, can execute /sbin/umount.cifs (if it is present and -i is not specified to umount).\n); } static int umount_check_perm(char * dir) @@ -100,8 +101,11 @@ int fileid; int rc; + /* allow root to unmount, no matter what */ + if(getuid() == 0) + return 0; +
svn commit: samba-docs r518 - in trunk/manpages: .
Author: sfrench Date: 2005-04-28 22:44:34 + (Thu, 28 Apr 2005) New Revision: 518 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=518 Log: Fix description of umount -i (it was backwards). Modified: trunk/manpages/umount.cifs.8.xml Changeset: Modified: trunk/manpages/umount.cifs.8.xml === --- trunk/manpages/umount.cifs.8.xml2005-04-28 14:53:39 UTC (rev 517) +++ trunk/manpages/umount.cifs.8.xml2005-04-28 22:44:34 UTC (rev 518) @@ -31,7 +31,7 @@ paraumount.cifs unmounts a Linux CIFS filesystem. It can be invoked indirectly by the citerefentryrefentrytitleumount/refentrytitlemanvolnum8/manvolnum/citerefentry command -when using the -i option. The umount.cifs command only works in Linux, and the kernel must +when umount.cifs is in /sbin directory, unless you specify the -i option to umount. Specifying -i to umount avoids execution of umount helpers such as umount.cifs. The umount.cifs command only works in Linux, and the kernel must support the cifs filesystem. The CIFS protocol is the successor to the SMB protocol and is supported by most Windows servers and many other commercial servers and Network Attached Storage appliances as well as
Build status as of Fri Apr 29 00:00:02 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-04-28 00:00:29.0 + +++ /home/build/master/cache/broken_results.txt 2005-04-29 00:00:19.0 + @@ -1,19 +1,18 @@ -Build status as of Thu Apr 28 00:00:02 2005 +Build status as of Fri Apr 29 00:00:02 2005 Build counts: Tree Total Broken Panic ccache 37 3 0 distcc 37 2 0 ppp 21 1 0 -rsync37 2 0 +rsync37 1 0 samba1 1 1 samba-docs 0 0 0 -samba4 39 20 0 -samba_3_039 8 0 +samba4 39 19 0 +samba_3_039 5 0 Currently broken builds: Host Tree Compiler Status -cyberone rsyncgccok/ok/ok/ 2 fusberta samba4 gccok/ 2/?/? samba-s390 samba4 gccok/ 2/?/? rhonwynsamba4 gcc-4.0ok/ 2/?/? @@ -21,7 +20,6 @@ rhonwynsamba4 tccok/ 2/?/? shelob ccache iccok/ok/ok/ 2 aretnapccache iccok/ok/ok/ 1 -aretnapsamba_3_0iccok/ok/ok/ 1 gc4samba4 gccok/ 1/?/? manhattan samba4 cc ok/ 1/?/? sbfsamba4 gccok/ 1/?/? @@ -34,10 +32,7 @@ gwen distcc cc ok/ 1/?/? gwen samba4 cc ok/ 1/?/? gwen samba_3_0cc ok/ 1/?/? -us4samba4 cc 77/?/?/? -us4samba_3_0cc 77/?/?/? -us4samba4 gcc 77/?/?/? -us4samba_3_0gcc 77/?/?/? +us4samba4 cc ok/ 1/?/? flock samba4 gccok/ 1/?/? shubnigurath samba4 cc ok/ 1/?/? gc20 samba4 gccok/ 2/?/?