Change dependency urls and package name

* Make Go skip the examples directory

25 files changed, 52 insertions, 48 deletions

diff --git a/examples/enterprise.ldif b/.examples/enterprise.ldif
index f0ec28f..f0ec28f 100644
--- a/examples/enterprise.ldif
+++ b/.examples/enterprise.ldif
diff --git a/examples/modify.go b/.examples/modify.go
index 75df43f..c02b921 100644
--- a/examples/modify.go
+++ b/.examples/modify.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mark-rushakoff/ldapserver"
+	ldapserver "github.com/metala/ldap"
 )
 
 var (
diff --git a/examples/proxy.go b/.examples/proxy.go
index bde4d34..2966b7d 100644
--- a/examples/proxy.go
+++ b/.examples/proxy.go
@@ -3,10 +3,11 @@ package main
 import (
 	"crypto/sha256"
 	"fmt"
-	"github.com/mark-rushakoff/ldapserver"
 	"log"
 	"net"
 	"sync"
+
+	ldapserver "github.com/metala/ldap"
 )
 
 type ldapHandler struct {
diff --git a/examples/search.go b/.examples/search.go
index 2b56a95..54fbb1c 100644
--- a/examples/search.go
+++ b/.examples/search.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mark-rushakoff/ldapserver"
+	ldapserver "github.com/metala/ldap"
 )
 
 var (
diff --git a/examples/searchSSL.go b/.examples/searchSSL.go
index c30b1cf..4226b4c 100644
--- a/examples/searchSSL.go
+++ b/.examples/searchSSL.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mark-rushakoff/ldapserver"
+	ldapserver "github.com/metala/ldap"
 )
 
 var (
diff --git a/examples/searchTLS.go b/.examples/searchTLS.go
index 0d13b7c..63c60c7 100644
--- a/examples/searchTLS.go
+++ b/.examples/searchTLS.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mark-rushakoff/ldapserver"
+	ldapserver "github.com/metala/ldap"
 )
 
 var (
diff --git a/examples/server.go b/.examples/server.go
index fdc2d80..688fb22 100644
--- a/examples/server.go
+++ b/.examples/server.go
@@ -1,9 +1,10 @@
 package main
 
 import (
-	"github.com/mark-rushakoff/ldapserver"
 	"log"
 	"net"
+
+	ldapserver "github.com/metala/ldap"
 )
 
 /////////////
diff --git a/examples/slapd.conf b/.examples/slapd.conf
index 5a66be0..0354eed 100644
--- a/examples/slapd.conf
+++ b/.examples/slapd.conf
@@ -2,9 +2,9 @@
 # See slapd.conf(5) for details on configuration options.
 # This file should NOT be world readable.
 #
-include		/private/etc/openldap/schema/core.schema
-include 	/private/etc/openldap/schema/cosine.schema
-include		/private/etc/openldap/schema/inetorgperson.schema
+include /private/etc/openldap/schema/core.schema
+include /private/etc/openldap/schema/cosine.schema
+include /private/etc/openldap/schema/inetorgperson.schema
 
 # Define global ACLs to disable default read access.
 
@@ -12,8 +12,8 @@ include		/private/etc/openldap/schema/inetorgperson.schema
 # service AND an understanding of referrals.
 #referral	ldap://root.openldap.org
 
-pidfile		/private/var/db/openldap/run/slapd.pid
-argsfile	/private/var/db/openldap/run/slapd.args
+pidfile /private/var/db/openldap/run/slapd.pid
+argsfile /private/var/db/openldap/run/slapd.args
 
 # Load dynamic backend modules:
 # modulepath	/usr/libexec/openldap
@@ -52,16 +52,16 @@ argsfile	/private/var/db/openldap/run/slapd.args
 # BDB database definitions
 #######################################################################
 
-database	bdb
-suffix		"dc=enterprise,dc=org"
-rootdn		"cn=admin,dc=enterprise,dc=org"
+database bdb
+suffix "dc=enterprise,dc=org"
+rootdn "cn=admin,dc=enterprise,dc=org"
 # Cleartext passwords, especially for the rootdn, should
 # be avoid.  See slappasswd(8) and slapd.conf(5) for details.
 # Use of strong authentication encouraged.
-rootpw		{SSHA}laO00HsgszhK1O0Z5qR0/i/US69Osfeu
-# The database directory MUST exist prior to running slapd AND 
+rootpw {SSHA}laO00HsgszhK1O0Z5qR0/i/US69Osfeu
+# The database directory MUST exist prior to running slapd AND
 # should only be accessible by the slapd and slap tools.
 # Mode 700 recommended.
-directory	/private/var/db/openldap/openldap-data
+directory /private/var/db/openldap/openldap-data
 # Indices to maintain
-index	objectClass	eq
+index objectClass eq
diff --git a/bind.go b/bind.go
index a082fff..7774fa5 100644
--- a/bind.go
+++ b/bind.go
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package ldapserver
+package ldap
 
 import (
 	"errors"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 func (l *Conn) Bind(username, password string) error {
diff --git a/conn.go b/conn.go
index 257f5d0..99f0f82 100644
--- a/conn.go
+++ b/conn.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package ldapserver
+package ldap
 
 import (
 	"crypto/tls"
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 const (
diff --git a/control.go b/control.go
index dc13c28..7be522e 100644
--- a/control.go
+++ b/control.go
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package ldapserver
+package ldap
 
 import (
 	"fmt"
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
 	"strings"
+
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 const (
diff --git a/debug.go b/debug.go
index 5eedab5..a12fc68 100644
--- a/debug.go
+++ b/debug.go
@@ -1,9 +1,9 @@
-package ldapserver
+package ldap
 
 import (
 	"log"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 // debbuging type
diff --git a/filter.go b/filter.go
index f26253e..276e522 100644
--- a/filter.go
+++ b/filter.go
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package ldapserver
+package ldap
 
 import (
 	"errors"
 	"fmt"
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
 	"strings"
+
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 const (
diff --git a/filter_test.go b/filter_test.go
index 0da3b9d..5439e08 100644
--- a/filter_test.go
+++ b/filter_test.go
@@ -1,10 +1,10 @@
-package ldapserver
+package ldap
 
 import (
 	"reflect"
 	"testing"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 type compileTest struct {
diff --git a/ldap.go b/ldap.go
index 889df00..9d14516 100644
--- a/ldap.go
+++ b/ldap.go
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package ldapserver
+package ldap
 
 import (
 	"errors"
 	"fmt"
 	"io/ioutil"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 // LDAP Application Codes
diff --git a/ldap_test.go b/ldap_test.go
index 686d788..31cfbf0 100644
--- a/ldap_test.go
+++ b/ldap_test.go
@@ -1,4 +1,4 @@
-package ldapserver
+package ldap
 
 import (
 	"fmt"
diff --git a/modify.go b/modify.go
index 52528ce..36e604e 100644
--- a/modify.go
+++ b/modify.go
@@ -27,13 +27,13 @@
 // AttributeValue ::= OCTET STRING
 //
 
-package ldapserver
+package ldap
 
 import (
 	"errors"
 	"log"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 const (
diff --git a/search.go b/search.go
index 15176c7..729dc13 100644
--- a/search.go
+++ b/search.go
@@ -57,14 +57,14 @@
 //
 //
 
-package ldapserver
+package ldap
 
 import (
 	"errors"
 	"fmt"
 	"strings"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 const (
diff --git a/server.go b/server.go
index cafeec5..bc7848d 100644
--- a/server.go
+++ b/server.go
@@ -1,4 +1,4 @@
-package ldapserver
+package ldap
 
 import (
 	"crypto/tls"
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 type BindFunc func(bindDN, bindSimplePw string, conn net.Conn) (LDAPResultCode, error)
diff --git a/server_bind.go b/server_bind.go
index e0c19f4..c094b13 100644
--- a/server_bind.go
+++ b/server_bind.go
@@ -1,10 +1,10 @@
-package ldapserver
+package ldap
 
 import (
 	"log"
 	"net"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 func HandleBindRequest(req *ber.Packet, fn BindFunc, conn net.Conn) (resultCode LDAPResultCode) {
diff --git a/server_modify.go b/server_modify.go
index 009fefd..88187f1 100644
--- a/server_modify.go
+++ b/server_modify.go
@@ -1,10 +1,10 @@
-package ldapserver
+package ldap
 
 import (
 	"log"
 	"net"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 func HandleAddRequest(req *ber.Packet, boundDN string, fns map[string]Adder, conn net.Conn) (resultCode LDAPResultCode) {
diff --git a/server_modify_test.go b/server_modify_test.go
index 78c1fde..f6f54cc 100644
--- a/server_modify_test.go
+++ b/server_modify_test.go
@@ -1,4 +1,4 @@
-package ldapserver
+package ldap
 
 import (
 	"net"
diff --git a/server_search.go b/server_search.go
index aa290a3..170b758 100644
--- a/server_search.go
+++ b/server_search.go
@@ -1,4 +1,4 @@
-package ldapserver
+package ldap
 
 import (
 	"errors"
@@ -6,7 +6,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/mark-rushakoff/ldapserver/internal/asn1-ber"
+	"github.com/metala/ldap/internal/asn1-ber"
 )
 
 func HandleSearchRequest(req *ber.Packet, controls *[]Control, messageID uint64, boundDN string, server *Server, conn net.Conn) (resultErr error) {
diff --git a/server_search_test.go b/server_search_test.go
index b553d7a..4cf2089 100644
--- a/server_search_test.go
+++ b/server_search_test.go
@@ -1,4 +1,4 @@
-package ldapserver
+package ldap
 
 import (
 	"os/exec"
diff --git a/server_test.go b/server_test.go
index 56aeff6..9b9d579 100644
--- a/server_test.go
+++ b/server_test.go
@@ -1,4 +1,4 @@
-package ldapserver
+package ldap
 
 import (
 	"bytes"