opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-02 11:08:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

bump buildah to latest

Browse Source 
Also includes a small change to make us of
https://github.com/containers/buildah/pull/5039

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2023-09-12 15:30:07 +02:00
parent 18561f26ad
commit 2c2299ad85
155 changed files with 12220 additions and 14157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vendor/github.com/containers/buildah/pkg/chrootuser/user_unix.go generated vendored
View File

@@ -92,6 +92,19 @@ type lookupGroupEntry struct {
user string
}
func scanWithoutComments(rc *bufio.Scanner) (string, bool) {
for {
if !rc.Scan() {
return "", false
}
line := rc.Text()
if strings.HasPrefix(strings.TrimSpace(line), "#") {
continue
}
return line, true
}
}
func parseNextPasswd(rc *bufio.Scanner) *lookupPasswdEntry {
if !rc.Scan() {
return nil
@@ -118,10 +131,13 @@ func parseNextPasswd(rc *bufio.Scanner) *lookupPasswdEntry {
}
func parseNextGroup(rc *bufio.Scanner) *lookupGroupEntry {
if !rc.Scan() {
// On FreeBSD, /etc/group may contain comments:
// https://man.freebsd.org/cgi/man.cgi?query=group&sektion=5&format=html
// We need to ignore those lines rather than trying to parse them.
line, ok := scanWithoutComments(rc)
if !ok {
return nil
}
line := rc.Text()
fields := strings.Split(line, ":")
if len(fields) != 4 {
return nil