From: Volker Lendecke <vl@samba.org>
Date: Sat, 25 Sep 2010 17:56:58 +0000 (-0700)
Subject: s3: Fix bug 7470
X-Git-Tag: release-alpha-4-0-0alpha14~2851
X-Git-Url: http://git.samba.org/?p=amitay%2Fsamba.git;a=commitdiff_plain;h=e81db37a87b83b6ff10ab513eb4a4d06a2c20b17

s3: Fix bug 7470

S_IREAD and S_IWRITE are not standard.

Thanks to Joachim Schmitz <schmitz@hp.com> for reporting!
---

diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c
index 394e31afcfa..b7a9522fe5b 100644
--- a/source3/registry/reg_api_regf.c
+++ b/source3/registry/reg_api_regf.c
@@ -278,7 +278,7 @@ static WERROR backup_registry_key(struct registry_key_handle *krecord,
 	/* open the registry file....fail if the file already exists */
 
 	regfile = regfio_open(fname, (O_RDWR|O_CREAT|O_EXCL),
-			      (S_IREAD|S_IWRITE));
+			      (S_IRUSR|S_IWUSR));
 	if (regfile == NULL) {
 		DEBUG(0,("backup_registry_key: failed to open \"%s\" (%s)\n",
 			 fname, strerror(errno) ));
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index e10ba008dfe..5b9f887b330 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -1267,7 +1267,8 @@ static int rpc_registry_copy(struct net_context *c, int argc, const char **argv
 	d_printf(_("ok\n"));
 
 	d_printf(_("Opening %s...."), argv[1]);
-	if ( !(outfile = regfio_open( argv[1], (O_RDWR|O_CREAT|O_TRUNC), (S_IREAD|S_IWRITE) )) ) {
+	if ( !(outfile = regfio_open( argv[1], (O_RDWR|O_CREAT|O_TRUNC),
+				      (S_IRUSR|S_IWUSR) )) ) {
 		d_fprintf(stderr, _("Failed to open %s for writing\n"),argv[1]);
 		goto out;
 	}
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 35b89112db4..6c6c7fdb013 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -279,7 +279,8 @@ int main( int argc, char *argv[] )
 		exit (1);
 	}
 
-	if ( !(outfile = regfio_open( new_filename, (O_RDWR|O_CREAT|O_TRUNC), (S_IREAD|S_IWRITE) )) ) {
+	if ( !(outfile = regfio_open( new_filename, (O_RDWR|O_CREAT|O_TRUNC),
+				      (S_IRUSR|S_IWUSR) )) ) {
 		fprintf( stderr, "Failed to open new file %s!\n", new_filename );
 		fprintf( stderr, "Error was (%s)\n", strerror(errno) );
 		exit (1);