Introduce "struct stat_ex" as a replacement for SMB_STRUCT_STAT

This patch introduces

struct stat_ex {
        dev_t           st_ex_dev;
        ino_t           st_ex_ino;
        mode_t          st_ex_mode;
        nlink_t         st_ex_nlink;
        uid_t           st_ex_uid;
        gid_t           st_ex_gid;
        dev_t           st_ex_rdev;
        off_t           st_ex_size;
        struct timespec st_ex_atime;
        struct timespec st_ex_mtime;
        struct timespec st_ex_ctime;
        struct timespec st_ex_btime; /* birthtime */
        blksize_t       st_ex_blksize;
        blkcnt_t        st_ex_blocks;
};
typedef struct stat_ex SMB_STRUCT_STAT;

It is really large because due to the friendly libc headers playing macro
tricks with fields like st_ino, so I renamed them to st_ex_xxx.

Why this change? To support birthtime, we already have quite a few #ifdef's at
places where it does not really belong. With a stat struct that we control, we
can consolidate the nanosecond timestamps and the birthtime deep in the VFS
stat calls.

At this moment it is triggered by a request to support the birthtime field for
GPFS. GPFS does not extend the system level struct stat, but instead has a
separate call that gets us the additional information beyond posix. Without
being able to do that within the VFS stat calls, that support would have to be
scattered around the main smbd code.

It will very likely break all the onefs modules, but I think the changes will
be reasonably easy to do.

3 files changed, 11 insertions, 11 deletions

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 69a41e30d9..6b0f70adfa 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -662,7 +662,7 @@ static int net_conf_addshare(struct net_context *c,
 		goto done;
 	}
 
-	if (!S_ISDIR(sbuf.st_mode)) {
+	if (!S_ISDIR(sbuf.st_ex_mode)) {
 		d_fprintf(stderr,
 			  "ERROR: path '%s' is not a directory.\n",
 			  path);
diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index dadb88303b..992a03d813 100644
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -250,13 +250,13 @@ static int get_share_list(TALLOC_CTX *ctx, const char *wcard, bool only_ours)
 			continue;
 		}
 
-		if (!S_ISREG(sbuf.st_mode)) {
+		if (!S_ISREG(sbuf.st_ex_mode)) {
 			d_fprintf(stderr, "get_share_list: file %s is not a regular file. Ignoring.\n",
 				path );
 			continue;
 		}
 
-		if (only_ours && sbuf.st_uid != myuid) {
+		if (only_ours && sbuf.st_ex_uid != myuid) {
 			continue;
 		}
 
@@ -364,7 +364,7 @@ static int info_fn(struct file_list *fl, void *priv)
 		return -1;
 	}
 
-	if (!S_ISREG(sbuf.st_mode)) {
+	if (!S_ISREG(sbuf.st_ex_mode)) {
 		d_fprintf(stderr, "info_fn: file %s is not a regular file. Ignoring.\n",
 			basepath );
 		close(fd);
@@ -574,7 +574,7 @@ static int count_num_usershares(void)
 			continue;
 		}
 
-		if (!S_ISREG(sbuf.st_mode)) {
+		if (!S_ISREG(sbuf.st_ex_mode)) {
 			d_fprintf(stderr, "count_num_usershares: file %s is not a regular file. Ignoring.\n",
 				path );
 			continue;
@@ -738,7 +738,7 @@ static int net_usershare_add(struct net_context *c, int argc, const char **argv)
 		return -1;
 	}
 
-	if (!S_ISDIR(sbuf.st_mode)) {
+	if (!S_ISDIR(sbuf.st_ex_mode)) {
 		d_fprintf(stderr, "net usershare add: path %s is not a directory.\n",
 			us_path );
 		TALLOC_FREE(ctx);
@@ -749,7 +749,7 @@ static int net_usershare_add(struct net_context *c, int argc, const char **argv)
 	/* If we're not root, check if we're restricted to sharing out directories
 	   that we own only. */
 
-	if ((myeuid != 0) && lp_usershare_owner_only() && (myeuid != sbuf.st_uid)) {
+	if ((myeuid != 0) && lp_usershare_owner_only() && (myeuid != sbuf.st_ex_uid)) {
 		d_fprintf(stderr, "net usershare add: cannot share path %s as "
 			"we are restricted to only sharing directories we own.\n"
 			"\tAsk the administrator to add the line \"usershare owner only = false\" \n"
@@ -887,7 +887,7 @@ static int net_usershare_add(struct net_context *c, int argc, const char **argv)
 		return -1;
 	}
 
-	if (!S_ISREG(sbuf.st_mode) || sbuf.st_dev != lsbuf.st_dev || sbuf.st_ino != lsbuf.st_ino) {
+	if (!S_ISREG(sbuf.st_ex_mode) || sbuf.st_ex_dev != lsbuf.st_ex_dev || sbuf.st_ex_ino != lsbuf.st_ex_ino) {
 		d_fprintf(stderr, "net usershare add: tmp file %s is not a regular file ?\n",
 				full_path_tmp );
 		TALLOC_FREE(ctx);
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index e8458fda1b..519eb6954a 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -60,7 +60,7 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
 		fprintf(stderr, "ERROR: lock directory %s does not exist\n",
 		       lp_lockdir());
 		ret = 1;
-	} else if ((st.st_mode & 0777) != 0755) {
+	} else if ((st.st_ex_mode & 0777) != 0755) {
 		fprintf(stderr, "WARNING: lock directory %s should have permissions 0755 for browsing to work\n",
 		       lp_lockdir());
 		ret = 1;
@@ -70,7 +70,7 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
 		fprintf(stderr, "ERROR: state directory %s does not exist\n",
 		       lp_statedir());
 		ret = 1;
-	} else if ((st.st_mode & 0777) != 0755) {
+	} else if ((st.st_ex_mode & 0777) != 0755) {
 		fprintf(stderr, "WARNING: state directory %s should have permissions 0755 for browsing to work\n",
 		       lp_statedir());
 		ret = 1;
@@ -80,7 +80,7 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
 		fprintf(stderr, "ERROR: cache directory %s does not exist\n",
 		       lp_cachedir());
 		ret = 1;
-	} else if ((st.st_mode & 0777) != 0755) {
+	} else if ((st.st_ex_mode & 0777) != 0755) {
 		fprintf(stderr, "WARNING: cache directory %s should have permissions 0755 for browsing to work\n",
 		       lp_cachedir());
 		ret = 1;