Merge ~ahasenack/ubuntu/+source/sssd:eoan-offline-reboot into ubuntu/+source/sssd:ubuntu/eoan-devel

[Andreas Hasenack]

Fix https://bugs.launchpad.net/bugs/1723350

The linked bug has the SRU template filled out with two test cases, corresponding to the two patches being added via this branch.

Focal and later have this fixed already.

[Christian Ehrhardt  (paelzer)]

Changelog:
- [√] changelog entry correct version and targeted codename
- [√] changelog entries correct
- [√] update-maintainer has been run

New Delta:
- [√] new patches are good or match what was proposed upstream
- [√] new patches correctly included in debian/patches/series?
- [√] new patches have correct DEP3 metadata

Build/Test:
- [√] build is ok

LGTM +1
Excessive (good) SRU details on the bug

[Christian Ehrhardt  (paelzer)]

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading b4460f38d45a622080b477028241d24d10d5ac93

$ git push pkg upload/2.2.0-4ubuntu1.1
Enumerating objects: 17, done.
Counting objects: 100% (17/17), done.
Delta compression using up to 4 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 3.44 KiB | 587.00 KiB/s, done.
Total 12 (delta 7), reused 0 (delta 0)
remote: Checking connectivity: 12, done.
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/sssd
 * [new tag] upload/2.2.0-4ubuntu1.1 -> upload/2.2.0-4ubuntu1.1

$ dput ubuntu ../sssd_2.2.0-4ubuntu1.1_source.changes
Checking signature on .changes
gpg: ../sssd_2.2.0-4ubuntu1.1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../sssd_2.2.0-4ubuntu1.1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading sssd_2.2.0-4ubuntu1.1.dsc: done.
  Uploading sssd_2.2.0-4ubuntu1.1.diff.gz: done.
  Uploading sssd_2.2.0-4ubuntu1.1_source.buildinfo: done.
  Uploading sssd_2.2.0-4ubuntu1.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 6e636f7..189489e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sssd (2.2.0-4ubuntu1.1) eoan; urgency=medium
+
+  * d/p/monitor-propagate-error.patch,
+    d/p/monitor-resolve-symlinks.patch: correctly monitor the
+    /etc/resolv.conf symlink when its target changes from a non-existent
+    file to one that exists (LP: #1723350)
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 12 May 2020 16:58:37 -0300
+
 sssd (2.2.0-4ubuntu1) eoan; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/patches/monitor-propagate-error.patch b/debian/patches/monitor-propagate-error.patch
new file mode 100644
index 0000000..89db976
--- /dev/null
+++ b/debian/patches/monitor-propagate-error.patch
@@ -0,0 +1,45 @@
+commit d20a7f9d5e56d1e9af273d97c7fd42fe8b2eda47
+Author: Samuel Cabrero <[e-mail]>
+Date:   Fri Jul 19 12:19:53 2019 +0200
+
+    MONITOR: Propagate error when resolv.conf does not exists in polling mode
+    
+    Return ENOENT when resolv.conf is missing after falling back to polling
+    mode. This way missing_resolv_conf will schedule a timer to check again
+    after some seconds.
+    
+    Signed-off-by: Samuel Cabrero <[e-mail]>
+    
+    Reviewed-by: Sumit Bose <[e-mail]>
+
+    Ubuntu note: part of https://github.com/SSSD/sssd/pull/864
+
+Origin: upstream, https://github.com/SSSD/sssd/commit/d20a7f9d5e56d1e9af273d97c7fd42fe8b2eda47
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sssd/+bug/1723350
+Last-Update: 2020-05-18
+diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
+index d3f8c8878..0b000a66f 100644
+--- a/src/monitor/monitor.c
++++ b/src/monitor/monitor.c
+@@ -1789,18 +1789,14 @@ static errno_t monitor_config_file_fallback(TALLOC_CTX *parent_ctx,
+     if (ret < 0) {
+         err = errno;
+         if (err == ENOENT) {
+-             DEBUG(SSSDBG_MINOR_FAILURE,
+-                   "file [%s] is missing. Will not update online status "
+-                   "based on watching the file\n", file);
+-             return EOK;
+-
++            DEBUG(SSSDBG_CRIT_FAILURE,
++                  "file [%s] is missing. Will try again later.\n", file);
+         } else {
+             DEBUG(SSSDBG_FATAL_FAILURE,
+                   "Could not stat file [%s]. Error [%d:%s]\n",
+                   file, err, strerror(err));
+-
+-            return err;
+         }
++        return err;
+     }
+ 
+     file_ctx->poll_check.parent_ctx = parent_ctx;
diff --git a/debian/patches/monitor-resolve-symlinks.patch b/debian/patches/monitor-resolve-symlinks.patch
new file mode 100644
index 0000000..089274c
--- /dev/null
+++ b/debian/patches/monitor-resolve-symlinks.patch
@@ -0,0 +1,104 @@
+commit d57c67e4efc64a16b874b46eb9670fdc9c73a39f
+Author: Samuel Cabrero <[e-mail]>
+Date:   Fri Jul 19 12:24:56 2019 +0200
+
+    MONITOR: Resolve symlinks setting the inotify watchers
+    
+    If resolv.conf is a symlink and sssd starts before getting an address
+    from dhcp the data provider will remain forever offline, as the watched
+    parent directory is the directory containing the symlink.
+    
+    Signed-off-by: Samuel Cabrero <[e-mail]>
+    
+    Reviewed-by: Sumit Bose <[e-mail]>
+    Ubuntu note: part of https://github.com/SSSD/sssd/pull/864
+
+Origin: upstream, https://github.com/SSSD/sssd/commit/d57c67e4efc64a16b874b46eb9670fdc9c73a39f
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sssd/+bug/1723350
+Last-Update: 2020-05-18
+diff --git a/src/util/inotify.c b/src/util/inotify.c
+index 2e2dc1a6e..ffc15ad4d 100644
+--- a/src/util/inotify.c
++++ b/src/util/inotify.c
+@@ -381,13 +381,62 @@ static int watch_ctx_destructor(void *memptr)
+     return 0;
+ }
+ 
++static errno_t resolve_filename(struct snotify_ctx *snctx,
++                                const char *filename,
++                                char *resolved,
++                                size_t resolved_size)
++{
++    /* NOTE: The code below relies in the GNU extensions for realpath,
++     * which will store in 'resolved' the prefix of 'filename' that does
++     * not exists if realpath call fails and errno is set to ENOENT */
++    if (realpath(filename, resolved) == NULL) {
++        char fcopy[PATH_MAX + 1];
++        char *p;
++        struct stat st;
++
++        if (errno != ENOENT) {
++            return errno;
++        }
++
++        /* Check if the unique missing component is the basename. The
++         * dirname must exist to be notified watching the parent dir. */
++        strncpy(fcopy, filename, sizeof(fcopy) - 1);
++        fcopy[PATH_MAX] = '\0';
++
++        p = dirname(fcopy);
++        if (p == NULL) {
++            return EIO;
++        }
++
++        if (stat(p, &st) == -1) {
++            return errno;
++        }
++
++        /* The basedir exist, check the caller requested to watch it.
++         * Otherwise return error as never will be notified. */
++
++        if ((snctx->snotify_flags & SNOTIFY_WATCH_DIR) == 0) {
++            return ENOENT;
++        }
++    }
++
++    return EOK;
++}
++
+ static errno_t copy_filenames(struct snotify_ctx *snctx,
+                               const char *filename)
+ {
+     char *p;
++    char resolved[PATH_MAX + 1];
+     char fcopy[PATH_MAX + 1];
++    errno_t ret;
++
++    ret = resolve_filename(snctx, filename, resolved, sizeof(resolved));
++    if (ret != EOK) {
++		return ret;
++    }
+ 
+-    strncpy(fcopy, filename, sizeof(fcopy) - 1);
++    strncpy(fcopy, resolved, sizeof(fcopy) - 1);
+     fcopy[PATH_MAX] = '\0';
+ 
+     p = dirname(fcopy);
+@@ -400,7 +449,7 @@ static errno_t copy_filenames(struct snotify_ctx *snctx,
+         return ENOMEM;
+     }
+ 
+-    strncpy(fcopy, filename, sizeof(fcopy) - 1);
++    strncpy(fcopy, resolved, sizeof(fcopy) - 1);
+     fcopy[PATH_MAX] = '\0';
+ 
+     p = basename(fcopy);
+@@ -413,7 +462,7 @@ static errno_t copy_filenames(struct snotify_ctx *snctx,
+         return ENOMEM;
+     }
+ 
+-    snctx->filename = talloc_strdup(snctx, filename);
++    snctx->filename = talloc_strdup(snctx, resolved);
+     if (snctx->filename == NULL) {
+         return ENOMEM;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 8bfa56a..a54e2d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ fix-whitespace-test.diff
 default-to-socket-activated-services.diff
 python3-shebang.patch
 restart-on-failure.patch
+monitor-resolve-symlinks.patch
+monitor-propagate-error.patch