Merge #1817

bors[bot] · SteveLauC · web-flow · commit be36bf05478a · 2022-09-17T17:02:46.000Z
1817: fix issue1814 add domainname field of utsname on android and linux r=asomers a=SteveLauC Closes #1814 Co-authored-by: Steve Lau <stevelauc@outlook.com> Co-authored-by: SteveLau <stevelauc@outlook.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   ([#1805](https://github.com/nix-rust/nix/pull/1805))
 - Expose the memfd module on FreeBSD (memfd was added in FreeBSD 13)
   ([#1808](https://github.com/nix-rust/nix/pull/1808))
-
+- Added `domainname` field of `UtsName` on Android and Linux
+  ([#1817](https://github.com/nix-rust/nix/pull/1817))
+  
 ### Changed
 
 - The MSRV is now 1.56.1
diff --git a/src/sys/utsname.rs b/src/sys/utsname.rs
@@ -35,6 +35,12 @@ impl UtsName {
     pub fn machine(&self) -> &OsStr {
         cast_and_trim(&self.0.machine)
     }
+
+    /// NIS or YP domain name of this machine.
+    #[cfg(any(target_os = "android", target_os = "linux"))]
+    pub fn domainname(&self) -> &OsStr {
+        cast_and_trim(&self.0.domainname)
+    }
 }
 
 /// Get system identification

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,12 @@ impl UtsName {`
`35`	`35`	`pub fn machine(&self) -> &OsStr {`
`36`	`36`	`cast_and_trim(&self.0.machine)`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ /// NIS or YP domain name of this machine.`
	`40`	`+ #[cfg(any(target_os = "android", target_os = "linux"))]`
	`41`	`+ pub fn domainname(&self) -> &OsStr {`
	`42`	`+ cast_and_trim(&self.0.domainname)`
	`43`	`+ }`
`38`	`44`	`}`
`39`	`45`
`40`	`46`	`/// Get system identification`