Merge pull request #2 from nxadm/ldif_version

Ldif version

Author: nxadm

input.go

@@ -28,11 +28,6 @@ func importLdifFile(file string, ignoreAttr []string) (entries, error) {
 func addLineToRecord(line *string, record *[]string, ignoreAttr []string, prevAttrSkipped *bool) error {
 	var err error
 
-	// Skip comments
-	if strings.HasPrefix(*line, "#") {
-		return nil
-	}
-
 	// Append continuation lines to previous line
 	if strings.HasPrefix(*line, " ") {
 		if *prevAttrSkipped { // but not lines from a skipped attribute
@@ -107,8 +102,28 @@ func readFile(file string, ignoreAttr []string, queue chan<- []string, wg *sync.
 	record := []string{}
 	scanner := bufio.NewScanner(fh)
 	var prevAttrSkipped bool // use to skip continuation lines of skipped attr
+	firstLine := true
 	for scanner.Scan() {
+
 		line := scanner.Text()
+
+		// Skip comments
+		if strings.HasPrefix(line, "#") {
+			continue
+		}
+
+		// Check if first line is a "version: *" line and skip it
+		if firstLine {
+			if strings.HasPrefix(line, "version: ") {
+				firstLine = false
+				continue
+			} else if line == "" {
+				continue
+			}
+			firstLine = false
+		}
+
+		// Import lines as records
 		*err = addLineToRecord(&line, &record, ignoreAttr, &prevAttrSkipped)
 		if *err != nil {
 			return
@@ -134,10 +149,23 @@ func readFile(file string, ignoreAttr []string, queue chan<- []string, wg *sync.
 func readStr(ldifStr string, ignoreAttr []string, queue chan<- []string, wg *sync.WaitGroup, err *error) {
 	defer wg.Done()
 	defer close(queue)
-	for _, recordStr := range strings.Split(ldifStr, "\n\n") {
+
+	for idx, recordStr := range strings.Split(ldifStr, "\n\n") {
 		var prevAttrSkipped bool
 		record := []string{}
 		for _, line := range strings.Split(recordStr, "\n") {
+
+			// Skip comments
+			if strings.HasPrefix(line, "#") {
+				continue
+			}
+
+			if idx == 0 { // First record only
+				if strings.HasPrefix(line, "version: ") {
+					continue
+				}
+			}
+
 			*err = addLineToRecord(&line, &record, ignoreAttr, &prevAttrSkipped)
 			if *err != nil {
 				return

t/source.ldif

@@ -1,5 +1,5 @@
-# LDIF ends with an empty line
-# A comment
+version: 1
+
 dn: identical,ou=aAccounts,dc=domain,dc=ext
 sambaSID: A samba id something
 eduPersonEntitlement: urn:mace:domain.ext:en