mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vendor: upgrade go-systemd to v15, remove cockroachdb/cmux

Browse Source 
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee
2017-09-11 14:53:37 -07:00
parent bc50a4591a
commit 7761a4672e
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/vendor/github.com/coreos/go-systemd/util/util_cgo.go generated vendored
View File

@ -122,11 +122,12 @@ func runningFromSystemService() (ret bool, err error) {
errno := C.my_sd_pid_get_owner_uid(sd_pid_get_owner_uid, 0, &uid) errno := C.my_sd_pid_get_owner_uid(sd_pid_get_owner_uid, 0, &uid)
serrno := syscall.Errno(-errno) serrno := syscall.Errno(-errno)
// when we're running from a unit file, sd_pid_get_owner_uid returns // when we're running from a unit file, sd_pid_get_owner_uid returns
// ENOENT (systemd <220) or ENXIO (systemd >=220) // ENOENT (systemd <220), ENXIO (systemd 220-223), or ENODATA
// (systemd >=234)
switch { switch {
case errno >= 0: case errno >= 0:
ret = false ret = false
case serrno == syscall.ENOENT, serrno == syscall.ENXIO: case serrno == syscall.ENOENT, serrno == syscall.ENXIO, serrno == syscall.ENODATA:
// Since the implementation of sessions in systemd relies on // Since the implementation of sessions in systemd relies on
// the `pam_systemd` module, using the sd_pid_get_owner_uid // the `pam_systemd` module, using the sd_pid_get_owner_uid
// heuristic alone can result in false positives if that module // heuristic alone can result in false positives if that module

8
glide.lock generated
View File

@ -1,5 +1,5 @@
hash: 680fead4df2e814f315fb1111c187f500faf7d9573295e331876a46aa126f8f7 hash: f12c87d509e99534547e948533b8e8a88043c2261c0be08f155a26cd920b5fd4
updated: 2017-09-06T14:59:05.315378166-07:00 updated: 2017-09-11T14:52:48.727295105-07:00
imports: imports:
- name: github.com/beorn7/perks - name: github.com/beorn7/perks
version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
@ -7,8 +7,6 @@ imports:
- quantile - quantile
- name: github.com/bgentry/speakeasy - name: github.com/bgentry/speakeasy
version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
- name: github.com/cockroachdb/cmux
version: 112f0506e7743d64a6eb8fedbcff13d9979bbf92
- name: github.com/coreos/bbolt - name: github.com/coreos/bbolt
version: e1c92081e510bb6b2bbfc93e7e6bd0b6dabd3e12 version: e1c92081e510bb6b2bbfc93e7e6bd0b6dabd3e12
- name: github.com/coreos/go-semver - name: github.com/coreos/go-semver
@ -16,7 +14,7 @@ imports:
subpackages: subpackages:
- semver - semver
- name: github.com/coreos/go-systemd - name: github.com/coreos/go-systemd
version: 48702e0da86bd25e76cfef347e2adeb434a0d0a6 version: d2196463941895ee908e13531a23a39feb9e1243
subpackages: subpackages:
- daemon - daemon
- journal - journal

4
glide.yaml
View File

@ -6,14 +6,12 @@ import:
version: v0.1.0 version: v0.1.0
- package: github.com/coreos/bbolt - package: github.com/coreos/bbolt
version: v1.3.1-coreos.1 version: v1.3.1-coreos.1
- package: github.com/cockroachdb/cmux
version: 112f0506e7743d64a6eb8fedbcff13d9979bbf92
- package: github.com/coreos/go-semver - package: github.com/coreos/go-semver
version: v0.2.0 version: v0.2.0
subpackages: subpackages:
- semver - semver
- package: github.com/coreos/go-systemd - package: github.com/coreos/go-systemd
version: v14 version: v15
subpackages: subpackages:
- daemon - daemon
- journal - journal