Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Dawid Ciepiela committed Jan 17, 2024
1 parent d196d60 commit 8da9894
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
1 change: 1 addition & 0 deletions oat/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ services:
networks:
- openldap

# To run ldapadmin, use the following command:
# docker-compose --profile ldapadmin up
phpldapadmin:
profiles:
Expand Down
1 change: 1 addition & 0 deletions pkg/lib/auth/func_dial.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ func Dial(opts *DialOptions) (conn net.Conn, err error) {

}

// switch over to TLS if necessary
if opts.URL.Scheme == LDAPS {
if opts.TLSConfig == nil {
opts.TLSConfig = &tls.Config{}
Expand Down
6 changes: 2 additions & 4 deletions pkg/lib/util/time.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"
)

// 1601-01-01 00:00:00 UTC
// Epoch start date: 1601-01-01 00:00:00 UTC
var Time1601 = time.Date(1601, time.January, 1, 0, 0, 0, 0, time.UTC)

// Retrieve date by applying offset. It should be in 0.1 µs
Expand All @@ -26,6 +26,4 @@ func TimeAfter1601(offset int64) time.Time {
}

// Retrieve current time since 1601-01-01 00:00:00 UTC
func TimeSince1601() time.Duration {
return time.Now().UTC().Sub(Time1601)
}
func TimeSince1601() time.Duration { return time.Now().UTC().Sub(Time1601) }
Binary file removed pubring.gpg
Binary file not shown.
4 changes: 2 additions & 2 deletions scripts/setup/keyring.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ gpg --command-fd 0 --no-tty --batch --gen-key <<- EOF
Expire-Date: 0
%no-ask-passphrase
%no-protection
%pubring pubring.gpg
%secring secring.gpg
%commit
%echo done
EOF

pass init "$(gpg --list-keys --with-colons | head -n 5 | awk -F: '/^pub:/ { print $5 }')"

git log --oneline --decorate --graph --all -n 10

0 comments on commit 8da9894

Please sign in to comment.