From e45f83457931e08f9f6d5aec48f51fd390a01eb8 Mon Sep 17 00:00:00 2001
From: tmfkams <tmfkams@gmail.com>
Date: Sun, 19 Jan 2014 23:04:16 +0100
Subject: refactoring, fixes for go1.2, modify added

---
 bind.go | 88 ++++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'bind.go')

diff --git a/bind.go b/bind.go
index b941f0c..30bc83f 100644
--- a/bind.go
+++ b/bind.go
@@ -6,50 +6,50 @@
 package ldap
 
 import (
-   "github.com/mmitton/asn1-ber"
-   "os"
+	"errors"
+	"github.com/tmfkams/asn1-ber"
 )
 
-func (l *Conn) Bind( username, password string ) *Error {
-   messageID := l.nextMessageID()
-
-   packet := ber.Encode( ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "LDAP Request" )
-   packet.AppendChild( ber.NewInteger( ber.ClassUniversal, ber.TypePrimative, ber.TagInteger, messageID, "MessageID" ) )
-   bindRequest := ber.Encode( ber.ClassApplication, ber.TypeConstructed, ApplicationBindRequest, nil, "Bind Request" )
-   bindRequest.AppendChild( ber.NewInteger( ber.ClassUniversal, ber.TypePrimative, ber.TagInteger, 3, "Version" ) )
-   bindRequest.AppendChild( ber.NewString( ber.ClassUniversal, ber.TypePrimative, ber.TagOctetString, username, "User Name" ) )
-   bindRequest.AppendChild( ber.NewString( ber.ClassContext, ber.TypePrimative, 0, password, "Password" ) )
-   packet.AppendChild( bindRequest )
-
-   if l.Debug {
-      ber.PrintPacket( packet )
-   }
-
-   channel, err := l.sendMessage( packet )
-   if err != nil {
-      return err
-   }
-   if channel == nil {
-      return NewError( ErrorNetwork, os.NewError( "Could not send message" ) )
-   }
-   defer l.finishMessage( messageID )
-   packet = <-channel
-
-   if packet == nil {
-      return NewError( ErrorNetwork, os.NewError( "Could not retrieve response" ) )
-   }
-
-   if l.Debug {
-      if err := addLDAPDescriptions( packet ); err != nil {
-         return NewError( ErrorDebugging, err )
-      }
-      ber.PrintPacket( packet )
-   }
-
-   result_code, result_description := getLDAPResultCode( packet )
-   if result_code != 0 {
-      return NewError( result_code, os.NewError( result_description ) )
-   }
-
-   return nil
+func (l *Conn) Bind(username, password string) *Error {
+	messageID := l.nextMessageID()
+
+	packet := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "LDAP Request")
+	packet.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimative, ber.TagInteger, messageID, "MessageID"))
+	bindRequest := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationBindRequest, nil, "Bind Request")
+	bindRequest.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimative, ber.TagInteger, 3, "Version"))
+	bindRequest.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimative, ber.TagOctetString, username, "User Name"))
+	bindRequest.AppendChild(ber.NewString(ber.ClassContext, ber.TypePrimative, 0, password, "Password"))
+	packet.AppendChild(bindRequest)
+
+	if l.Debug {
+		ber.PrintPacket(packet)
+	}
+
+	channel, err := l.sendMessage(packet)
+	if err != nil {
+		return err
+	}
+	if channel == nil {
+		return NewError(ErrorNetwork, errors.New("Could not send message"))
+	}
+	defer l.finishMessage(messageID)
+	packet = <-channel
+
+	if packet == nil {
+		return NewError(ErrorNetwork, errors.New("Could not retrieve response"))
+	}
+
+	if l.Debug {
+		if err := addLDAPDescriptions(packet); err != nil {
+			return NewError(ErrorDebugging, err.Err)
+		}
+		ber.PrintPacket(packet)
+	}
+
+	result_code, result_description := getLDAPResultCode(packet)
+	if result_code != 0 {
+		return NewError(result_code, errors.New(result_description))
+	}
+
+	return nil
 }
-- 
cgit v1.2.3