Changed Attribute type from uint16 to int16, NonExistingAttribute = -1

lkarlslund · Apr 21, 2022 · 60ded9f · 60ded9f
1 parent 3cf5c1f
commit 60ded9f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/modules/engine/attributes.go b/modules/engine/attributes.go
@@ -48,7 +48,7 @@ var mergeapprovers []mergeapproverinfo
 var attributenums []attributeinfo
 
 var (
-	NonExistingAttribute = NewAttribute("*NON EXISTING ATTRIBUTE*")
+	NonExistingAttribute = Attribute(-1)
 
 	DistinguishedName     = NewAttribute("distinguishedName").Single().Unique()
 	ObjectClass           = NewAttribute("objectClass")
@@ -98,7 +98,7 @@ var (
 	MetaLAPSInstalled           = NewAttribute("_haslaps")
 )
 
-type Attribute uint16
+type Attribute int16
 
 var attributemutex sync.RWMutex
 

diff --git a/modules/engine/object.go b/modules/engine/object.go
@@ -630,7 +630,8 @@ func init() {
 func (o *Object) setFlex(flexinit ...interface{}) {
 	var ignoreblanks bool
 
-	var attribute Attribute
+	attribute := NonExistingAttribute
+
 	data := avsPool.Get().(AttributeValueSlice)
 	for _, i := range flexinit {
 		if i == IgnoreBlanks {
@@ -724,17 +725,22 @@ func (o *Object) setFlex(flexinit ...interface{}) {
 		case NoValues:
 			// Ignore it
 		case Attribute:
-			if attribute != 0 && (!ignoreblanks || len(data) > 0) {
-				o.set(attribute, data)
+			if attribute != NonExistingAttribute && (!ignoreblanks || len(data) > 0) {
+				newdata := make(AttributeValueSlice, len(data))
+				copy(newdata, data)
+				o.set(attribute, newdata)
+
 				data = data[:0]
 			}
 			attribute = v
 		default:
 			panic("SetFlex called with invalid type in object declaration")
 		}
 	}
-	if attribute != 0 && (!ignoreblanks || len(data) > 0) {
+	if attribute != NonExistingAttribute && (!ignoreblanks || len(data) > 0) {
 		o.set(attribute, data)
+	}
+	if len(data) > 0 {
 		data = data[:0]
 	}
 	avsPool.Put(data)