Author: jerry Date: 2006-08-24 12:49:18 +0000 (Thu, 24 Aug 2006) New Revision: 17797
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17797 Log: Just say "ok" when trying to rename a local group to its same name. Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c Changeset: Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c =================================================================== --- branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2006-08-24 12:36:09 UTC (rev 17796) +++ branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2006-08-24 12:49:18 UTC (rev 17797) @@ -4612,7 +4612,7 @@ switch (ctr->level) { case 2: { - fstring group_name; + fstring group_name, acct_name; NTSTATUS status; /* We currently do not support renaming groups in the @@ -4624,13 +4624,20 @@ return NT_STATUS_SPECIAL_ACCOUNT; } - /* There has to be a valid name */ + /* There has to be a valid name (and it has to be different) */ + if ( !ctr->alias.info2.name.string ) return NT_STATUS_INVALID_PARAMETER; - unistr2_to_ascii( info.acct_name, ctr->alias.info2.name.string, - sizeof(info.acct_name)-1 ); + unistr2_to_ascii( acct_name, ctr->alias.info2.name.string, + sizeof(acct_name)-1 ); + /* If the name is the same just reply "ok". Yes this + doesn't allow you to change the case of a group name. */ + + if ( strequal( acct_name, info.acct_name ) ) + return NT_STATUS_OK; + /* make sure the name doesn't already exist as a user or local group */
