23 Oct
2014
23 Oct
'14
6:36 p.m.
Author: ekohl
Date: Thu Oct 23 18:36:11 2014
New Revision: 64934
URL: http://svn.reactos.org/svn/reactos?rev=64934&view=rev
Log:
[NET]
Implement the first part of the NET USER command.
Added:
trunk/reactos/base/applications/network/net/cmdUser.c (with props)
Modified:
trunk/reactos/base/applications/network/net/CMakeLists.txt
trunk/reactos/base/applications/network/net/lang/en-US.rc
trunk/reactos/base/applications/network/net/lang/ro-RO.rc
trunk/reactos/base/applications/network/net/lang/ru-RU.rc
trunk/reactos/base/applications/network/net/main.c
trunk/reactos/base/applications/network/net/net.h
Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] Thu Oct 23
18:36:11 2014
@@ -10,6 +10,7 @@
cmdPause.c
cmdStart.c
cmdStop.c
+ cmdUser.c
help.c
net.h)
Added: trunk/reactos/base/applications/network/net/cmdUser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/cmdUser.c (added)
+++ trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] Thu Oct 23 18:36:11
2014
@@ -0,0 +1,348 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS net command
+ * FILE:
+ * PURPOSE:
+ *
+ * PROGRAMMERS: Eric Kohl
+ */
+
+#include "net.h"
+
+
+static
+int
+CompareInfo(const void *a,
+ const void *b)
+{
+ return _wcsicmp(((PUSER_INFO_0)a)->usri0_name,
+ ((PUSER_INFO_0)b)->usri0_name);
+}
+
+
+static
+NET_API_STATUS
+EnumerateUsers(VOID)
+{
+ PUSER_INFO_0 pBuffer = NULL;
+ PSERVER_INFO_100 pServer = NULL;
+ DWORD dwRead = 0, dwTotal = 0;
+ DWORD i;
+ DWORD_PTR ResumeHandle = 0;
+ NET_API_STATUS Status;
+
+ Status = NetServerGetInfo(NULL,
+ 100,
+ (LPBYTE*)&pServer);
+ if (Status != NERR_Success)
+ return Status;
+
+ printf("\nUser accounts for \\\\%S\n\n", pServer->sv100_name);
+
+ NetApiBufferFree(pServer);
+
+ printf("------------------------------------------\n");
+
+ Status = NetUserEnum(NULL,
+ 0,
+ 0,
+ (LPBYTE*)&pBuffer,
+ MAX_PREFERRED_LENGTH,
+ &dwRead,
+ &dwTotal,
+ &ResumeHandle);
+ if (Status != NERR_Success)
+ return Status;
+
+ qsort(pBuffer,
+ dwRead,
+ sizeof(PUSER_INFO_0),
+ CompareInfo);
+
+// printf("dwRead: %lu dwTotal: %lu\n", dwRead, dwTotal);
+ for (i = 0; i < dwRead; i++)
+ {
+// printf("%p\n", pBuffer[i].lgrpi0_name);
+ if (pBuffer[i].usri0_name)
+ printf("%S\n", pBuffer[i].usri0_name);
+ }
+
+ NetApiBufferFree(pBuffer);
+
+ return NERR_Success;
+}
+
+
+static
+VOID
+PrintDateTime(DWORD dwSeconds)
+{
+ LARGE_INTEGER Time;
+ FILETIME FileTime;
+ SYSTEMTIME SystemTime;
+ WCHAR DateBuffer[80];
+ WCHAR TimeBuffer[80];
+
+ RtlSecondsSince1970ToTime(dwSeconds, &Time);
+ FileTime.dwLowDateTime = Time.u.LowPart;
+ FileTime.dwHighDateTime = Time.u.HighPart;
+ FileTimeToSystemTime(&FileTime, &SystemTime);
+
+ GetDateFormatW(LOCALE_USER_DEFAULT,
+ DATE_SHORTDATE,
+ &SystemTime,
+ NULL,
+ DateBuffer,
+ 80);
+
+ GetTimeFormatW(LOCALE_USER_DEFAULT,
+ TIME_NOSECONDS,
+ &SystemTime,
+ NULL,
+ TimeBuffer,
+ 80);
+
+ printf("%S %S\n", DateBuffer, TimeBuffer);
+}
+
+
+static
+NET_API_STATUS
+DisplayUser(LPWSTR lpUserName)
+{
+ PUSER_INFO_4 pUserInfo = NULL;
+ NET_API_STATUS Status;
+
+ /* Modify the user */
+ Status = NetUserGetInfo(NULL,
+ lpUserName,
+ 4,
+ (LPBYTE*)&pUserInfo);
+ if (Status != NERR_Success)
+ return Status;
+
+ printf("User name %S\n", pUserInfo->usri4_name);
+ printf("Full name %S\n",
pUserInfo->usri4_full_name);
+ printf("Comment %S\n", pUserInfo->usri4_comment);
+ printf("User comment %S\n",
pUserInfo->usri4_usr_comment);
+ printf("Country code %03ld ()\n",
pUserInfo->usri4_country_code);
+ printf("Account active %S\n", (pUserInfo->usri4_flags
& UF_ACCOUNTDISABLE)? L"No" : ((pUserInfo->usri4_flags & UF_LOCKOUT)
? L"Locked" : L"Yes"));
+ printf("Account expires ");
+ if (pUserInfo->usri4_acct_expires == TIMEQ_FOREVER)
+ printf("Never\n");
+ else
+ PrintDateTime(pUserInfo->usri4_acct_expires);
+
+ printf("\n");
+ printf("Password last set \n");
+ printf("Password expires \n");
+ printf("Password changeable \n");
+ printf("Password required \n");
+ printf("User may change password \n");
+ printf("\n");
+ printf("Workstation allowed %S\n",
pUserInfo->usri4_workstations);
+ printf("Logon script %S\n",
pUserInfo->usri4_script_path);
+ printf("User profile %S\n", pUserInfo->usri4_profile);
+ printf("Home directory %S\n", pUserInfo->usri4_home_dir);
+ printf("Last logon ");
+ if (pUserInfo->usri4_last_logon == 0)
+ printf("Never\n");
+ else
+ PrintDateTime(pUserInfo->usri4_last_logon);
+ printf("\n");
+ printf("Logon hours allowed \n");
+ printf("\n");
+ printf("Local group memberships \n");
+ printf("Global group memberships \n");
+
+ if (pUserInfo != NULL)
+ NetApiBufferFree(pUserInfo);
+
+ return NERR_Success;
+}
+
+
+INT
+cmdUser(
+ INT argc,
+ WCHAR **argv)
+{
+ INT i, j;
+ INT result = 0;
+ BOOL bAdd = FALSE;
+ BOOL bDelete = FALSE;
+#if 0
+ BOOL bDomain = FALSE;
+#endif
+ LPWSTR lpUserName = NULL;
+ LPWSTR lpPassword = NULL;
+ PUSER_INFO_4 pUserInfo = NULL;
+ USER_INFO_4 UserInfo;
+ NET_API_STATUS Status;
+
+ if (argc == 2)
+ {
+ Status = EnumerateUsers();
+ printf("Status: %lu\n", Status);
+ return 0;
+ }
+ else if (argc == 3)
+ {
+ Status = DisplayUser(argv[2]);
+ printf("Status: %lu\n", Status);
+ return 0;
+ }
+
+ i = 2;
+ if (argv[i][0] != L'/')
+ {
+ lpUserName = argv[i];
+ printf("User: %S\n", lpUserName);
+ i++;
+ }
+
+ if (argv[i][0] != L'/')
+ {
+ lpPassword = argv[i];
+ printf("Password: %S\n", lpPassword);
+ i++;
+ }
+
+ for (j = i; j < argc; j++)
+ {
+ if (_wcsicmp(argv[j], L"/help") == 0)
+ {
+ PrintResourceString(IDS_USER_HELP);
+ return 0;
+ }
+ else if (_wcsicmp(argv[j], L"/add") == 0)
+ {
+ bAdd = TRUE;
+ }
+ else if (_wcsicmp(argv[j], L"/delete") == 0)
+ {
+ bDelete = TRUE;
+ }
+ else if (_wcsicmp(argv[j], L"/domain") == 0)
+ {
+ printf("The /DOMAIN option is not supported yet!\n");
+#if 0
+ bDomain = TRUE;
+#endif
+ }
+ }
+
+ if (bAdd && bDelete)
+ {
+ result = 1;
+ goto done;
+ }
+
+ if (!bAdd && !bDelete)
+ {
+ /* Modify the user */
+ Status = NetUserGetInfo(NULL,
+ lpUserName,
+ 4,
+ (LPBYTE*)&pUserInfo);
+ printf("Status: %lu\n", Status);
+ }
+ else if (bAdd && !bDelete)
+ {
+ /* Add the user */
+ ZeroMemory(&UserInfo, sizeof(USER_INFO_4));
+
+ UserInfo.usri4_name = lpUserName;
+ UserInfo.usri4_password = lpPassword;
+ UserInfo.usri4_flags = UF_SCRIPT | UF_NORMAL_ACCOUNT;
+
+ pUserInfo = &UserInfo;
+ }
+
+ for (j = i; j < argc; j++)
+ {
+ if (_wcsnicmp(argv[j], L"/active:", 8) == 0)
+ {
+ }
+ else if (_wcsnicmp(argv[j], L"/comment:", 9) == 0)
+ {
+ pUserInfo->usri4_comment = &argv[j][9];
+ }
+ else if (_wcsnicmp(argv[j], L"/countrycode:", 13) == 0)
+ {
+ }
+ else if (_wcsnicmp(argv[j], L"/expires:", 9) == 0)
+ {
+ }
+ else if (_wcsnicmp(argv[j], L"/fullname:", 10) == 0)
+ {
+ pUserInfo->usri4_full_name = &argv[j][10];
+ }
+ else if (_wcsnicmp(argv[j], L"/homedir:", 9) == 0)
+ {
+ pUserInfo->usri4_home_dir = &argv[j][9];
+ }
+ else if (_wcsnicmp(argv[j], L"/passwordchg:", 13) == 0)
+ {
+ }
+ else if (_wcsnicmp(argv[j], L"/passwordreq:", 13) == 0)
+ {
+ }
+ else if (_wcsnicmp(argv[j], L"/profilepath:", 13) == 0)
+ {
+ pUserInfo->usri4_profile = &argv[j][13];
+ }
+ else if (_wcsnicmp(argv[j], L"/scriptpath:", 12) == 0)
+ {
+ pUserInfo->usri4_script_path = &argv[j][12];
+ }
+ else if (_wcsnicmp(argv[j], L"/times:", 7) == 0)
+ {
+ }
+ else if (_wcsnicmp(argv[j], L"/usercomment:", 13) == 0)
+ {
+ pUserInfo->usri4_usr_comment = &argv[j][13];
+ }
+ else if (_wcsnicmp(argv[j], L"/workstations:", 14) == 0)
+ {
+ }
+ }
+
+ if (!bAdd && !bDelete)
+ {
+ /* Modify the user */
+ Status = NetUserSetInfo(NULL,
+ lpUserName,
+ 4,
+ (LPBYTE)pUserInfo,
+ NULL);
+ printf("Status: %lu\n", Status);
+ }
+ else if (bAdd && !bDelete)
+ {
+ /* Add the user */
+ Status = NetUserAdd(NULL,
+ 4,
+ (LPBYTE)pUserInfo,
+ NULL);
+ printf("Status: %lu\n", Status);
+ }
+ else if (!bAdd && bDelete)
+ {
+ /* Delete the user */
+ Status = NetUserDel(NULL,
+ lpUserName);
+ printf("Status: %lu\n", Status);
+ }
+
+done:
+ if (!bAdd && !bDelete && pUserInfo != NULL)
+ NetApiBufferFree(pUserInfo);
+
+ if (result != 0)
+ PrintResourceString(IDS_USER_SYNTAX);
+
+ return result;
+}
+
+/* EOF */
Propchange: trunk/reactos/base/applications/network/net/cmdUser.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/network/net/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] Thu Oct 23
18:36:11 2014
@@ -44,7 +44,9 @@
IDS_TIME_HELP "TIME\n..."
IDS_USE_SYNTAX "Usage:\nNET USE ..."
IDS_USE_HELP "USE\n..."
- IDS_USER_SYNTAX "Usage:\nNET USER ..."
+ IDS_USER_SYNTAX "Usage:\nNET USER [username [password | *] [options]]
[/DOMAIN]\n\
+ username {password | *} /ADD [options] [/DOMAIN]\n\
+ username [/DELETE] [/DOMAIN]"
IDS_USER_HELP "USER\n..."
IDS_VIEW_SYNTAX "Usage:\nNET VIEW ..."
IDS_VIEW_HELP "VIEW\n..."
Modified: trunk/reactos/base/applications/network/net/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] Thu Oct 23
18:36:11 2014
@@ -50,7 +50,9 @@
IDS_TIME_HELP "TIME\n..."
IDS_USE_SYNTAX "Utilizare:\nNET USE ..."
IDS_USE_HELP "USE\n..."
- IDS_USER_SYNTAX "Utilizare:\nNET USER ..."
+ IDS_USER_SYNTAX "Utilizare:\nNET USER [username [password | *] [options]]
[/DOMAIN]\n\
+ username {password | *} /ADD [options] [/DOMAIN]\n\
+ username [/DELETE] [/DOMAIN]"
IDS_USER_HELP "USER\n..."
IDS_VIEW_SYNTAX "Utilizare:\nNET VIEW ..."
IDS_VIEW_HELP "VIEW\n..."
Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Thu Oct 23
18:36:11 2014
@@ -45,7 +45,9 @@
IDS_TIME_HELP "TIME\n..."
IDS_USE_SYNTAX "ÐÑполÑзование:\nNET USE ..."
IDS_USE_HELP "USE\n..."
- IDS_USER_SYNTAX "ÐÑполÑзование:\nNET USER ..."
+ IDS_USER_SYNTAX "ÐÑполÑзование:\nNET USER [username [password | *]
[options]] [/DOMAIN]\n\
+ username {password | *} /ADD [options] [/DOMAIN]\n\
+ username [/DELETE] [/DOMAIN]"
IDS_USER_HELP "USER\n..."
IDS_VIEW_SYNTAX "ÐÑполÑзование:\nNET VIEW ..."
IDS_VIEW_HELP "VIEW\n..."
Modified: trunk/reactos/base/applications/network/net/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Thu Oct 23 18:36:11
2014
@@ -40,7 +40,7 @@
{L"stop", cmdStop},
{L"time", unimplemented},
{L"use", unimplemented},
- {L"user", unimplemented},
+ {L"user", cmdUser},
{L"view", unimplemented},
{NULL, NULL}
};
Modified: trunk/reactos/base/applications/network/net/net.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Thu Oct 23 18:36:11
2014
@@ -13,6 +13,7 @@
#include <windef.h>
#include <winbase.h>
+#include <winnls.h>
#include <winuser.h>
#include <winsvc.h>
#include <stdio.h>
@@ -39,5 +40,6 @@
INT cmdPause(INT argc, WCHAR **argv);
INT cmdStart(INT argc, WCHAR **argv);
INT cmdStop(INT argc, WCHAR **argv);
+INT cmdUser(INT argc, WCHAR **argv);
#endif /* _NET_PCH_ */
3676
days inactive
3676
days old
0 comments
1 participants
participants (1)
-
ekohl＠svn.reactos.org