svn commit: samba r10925 - in branches/tmp/samba4-winsrepl: . source/lib/ldb/include

[metze at samba.org]

Author: metze
Date: 2005-10-12 14:58:59 +0000 (Wed, 12 Oct 2005)
New Revision: 10925

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10925

Log:
 r13687 at SERNOX (orig r10924):  metze | 2005-10-12 16:58:14 +0200
 we don't need this line twice
 
 metze

Modified:
   branches/tmp/samba4-winsrepl/
   branches/tmp/samba4-winsrepl/source/lib/ldb/include/ldb.h


Changeset:

Property changes on: branches/tmp/samba4-winsrepl
___________________________________________________________________
Name: svk:merge
   - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10920
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5616
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5609
   + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10924
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5616
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5609

Modified: branches/tmp/samba4-winsrepl/source/lib/ldb/include/ldb.h
===================================================================
--- branches/tmp/samba4-winsrepl/source/lib/ldb/include/ldb.h	2005-10-12 14:58:14 UTC (rev 10924)
+++ branches/tmp/samba4-winsrepl/source/lib/ldb/include/ldb.h	2005-10-12 14:58:59 UTC (rev 10925)
@@ -243,7 +243,6 @@
 
 #define LDB_ATTR_FLAG_HIDDEN       (1<<0) /* the attribute is not returned by default */
 #define LDB_ATTR_FLAG_CONSTRUCTED  (1<<1) /* the attribute is constructed from other attributes */
-#define LDB_ATTR_FLAG_CONSTRUCTED  (1<<1) /* the attribute is constructed from other attributes */
 
 
 /* well-known ldap attribute syntaxes - see rfc2252 section 4.3.2 */