Merge remote-tracking branch 'upstream/master'

Conflicts:
	conf/app.ini

1 files changed, 24 insertions, 0 deletions

diff --git a/modules/ldap/debug.go b/modules/ldap/debug.go
new file mode 100644
index 00000000..8653a47b
--- /dev/null
+++ b/modules/ldap/debug.go
@@ -0,0 +1,24 @@
+package ldap
+
+import (
+	"log"
+
+	"github.com/gogits/gogs/modules/asn1-ber"
+)
+
+// debbuging type
+//     - has a Printf method to write the debug output
+type debugging bool
+
+// write debug output
+func (debug debugging) Printf(format string, args ...interface{}) {
+	if debug {
+		log.Printf(format, args...)
+	}
+}
+
+func (debug debugging) PrintPacket(packet *ber.Packet) {
+	if debug {
+		ber.PrintPacket(packet)
+	}
+}