summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-09-05 21:32:32 +0000
committerJeremy Allison <jra@samba.org>1997-09-05 21:32:32 +0000
commite7e49a6e6a1e7d5b1bc64563f29e7cebd5d8e01f (patch)
treec1b53d117a2c9a13de5a0025cb385ed818f3633c
parent4cbe451107286f0c7cbbae84b5cff0685a611c8d (diff)
downloadsamba-e7e49a6e6a1e7d5b1bc64563f29e7cebd5d8e01f.tar.gz
samba-e7e49a6e6a1e7d5b1bc64563f29e7cebd5d8e01f.tar.bz2
samba-e7e49a6e6a1e7d5b1bc64563f29e7cebd5d8e01f.zip
client.c: Made sure myhostname was initialised before substitutions.
status.c: Made sure myhostname was initialised before substitutions. server.c trans2.c: Moved OS/2 WPS fix. Jeremy (jallison@whistle.com) (This used to be commit 8a12b6a4f0feec712f5c4e02e21198c455b060ae)
-rw-r--r--source3/client/client.c6
-rw-r--r--source3/smbd/server.c6
-rw-r--r--source3/smbd/trans2.c4
-rw-r--r--source3/utils/status.c4
4 files changed, 14 insertions, 6 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 329956ce94..4718db84ac 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -34,6 +34,7 @@ pstring cd_path = "";
pstring service="";
pstring desthost="";
extern pstring myname;
+extern pstring myhostname;
pstring password = "";
pstring username="";
pstring workgroup="";
@@ -4625,6 +4626,11 @@ static void usage(char *pname)
DEBUG(3,("%s client started (version %s)\n",timestring(),VERSION));
+ if(!get_myname(myhostname,NULL))
+ {
+ DEBUG(0,("Failed to get my hostname.\n"));
+ }
+
if (!lp_load(servicesf,True)) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
}
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e2fe14b0b8..d4407269f0 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1532,7 +1532,13 @@ void open_file_shared(int fnum,int cnum,char *fname,int share_mode,int ofun,
if (strstr(fname,".+,;=[]."))
{
unix_ERR_class = ERRDOS;
+ /* OS/2 Workplace shell fix may be main code stream in a later release. */
+#ifdef OS2_WPS_FIX
+ unix_ERR_code = ERRcannotopen;
+#else /* OS2_WPS_FIX */
unix_ERR_code = ERROR_EAS_NOT_SUPPORTED;
+#endif /* OS2_WPS_FIX */
+
return;
}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 0ef7327d2e..19c1158658 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1299,11 +1299,7 @@ static int call_trans2setfilepathinfo(char *inbuf, char *outbuf, int length,
if (total_data > 0 && IVAL(pdata,0) == total_data) {
/* uggh, EAs for OS2 */
DEBUG(4,("Rejecting EA request with total_data=%d\n",total_data));
-#ifdef OS2_WPS_FIX /* This may become the main code stream in a later release */
- return(ERROR(ERRDOS,ERRcannotopen));
-#else /* OS2_WPS_FIX */
return(ERROR(ERRDOS,ERROR_EAS_NOT_SUPPORTED));
-#endif /* OS2_WPS_FIX */
}
switch (info_level)
diff --git a/source3/utils/status.c b/source3/utils/status.c
index b439741e6c..6fa85c0a63 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -188,13 +188,13 @@ locking version (was %d, should be %d).\n",fname,
}
}
+ get_myname(myhostname, NULL);
+
if (!lp_load(servicesf,False)) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
return (-1);
}
- get_myname(myhostname, NULL);
-
if (verbose) {
printf("using configfile = %s\n", servicesf);
printf("lockdir = %s\n", *lp_lockdir() ? lp_lockdir() : "NULL");